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

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

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

@@ -39,6 +39,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     PRODUCT_HAS_WAREHOUSE(79502, "存在物料默认仓库资料为该仓库资料,无法删除"),
     PRODUCTWH_HAS_WAREHOUSE(79503, "该仓库资料存在库存,无法删除"),
     ACCOUNT_EXISTS(79503, "账号已存在"),
+    USING_EXISTS(79504, ""),
 
 
 

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Configs.java

@@ -0,0 +1,102 @@
+package com.usoftchina.saas.commons.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.util.Date;
+
+/** 系统参数
+ * @author: guq
+ * @create: 2018-11-16 11:19
+ **/
+public class Configs {
+
+    private Long id;
+
+    private String code;
+
+    private String description;
+
+    private String data;
+
+    private Long companyId;
+
+    private String creatorName;
+
+    private Integer creatorId;
+
+    private Date createTime;
+
+    private String updaterName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data == null ? null : data.trim();
+    }
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getCreatorName() {
+        return creatorName;
+    }
+
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName == null ? null : creatorName.trim();
+    }
+
+    public Integer getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(Integer creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdaterName() {
+        return updaterName;
+    }
+
+    public void setUpdaterName(String updaterName) {
+        this.updaterName = updaterName == null ? null : updaterName.trim();
+    }
+}

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/ConfigsController.java

@@ -0,0 +1,44 @@
+package com.usoftchina.saas.commons.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.commons.po.Configs;
+import com.usoftchina.saas.commons.service.ConfigsService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author: guq
+ * @create: 2018-11-16 10:05
+ **/
+@RestController
+@RequestMapping("/configs")
+public class ConfigsController {
+
+    @Autowired
+    private ConfigsService configsService;
+
+    @GetMapping("/list")
+    public Result<Configs> getListData(PageRequest page, ListReqDTO req) {
+        PageInfo<Configs> listData = configsService.getListData(page, req);
+        return Result.success(listData);
+    }
+
+    @GetMapping("/getConfigByCode")
+    public Result<Configs> getConfigByCode(String code) {
+        Configs data = configsService.getConfigByCode(code);
+        return Result.success(data);
+    }
+
+    @GetMapping("/save")
+    public Result<DocBaseDTO> save(Configs data) {
+        DocBaseDTO baseDTO = configsService.save(data);
+        return Result.success(baseDTO);
+    }
+
+}

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/mapper/ConfigsMapper.java

@@ -0,0 +1,24 @@
+package com.usoftchina.saas.commons.mapper;
+
+import com.usoftchina.saas.commons.po.Configs;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ConfigsMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(Configs record);
+
+    int insertSelective(Configs record);
+
+    Configs selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(Configs record);
+
+    int updateByPrimaryKey(Configs record);
+
+    List<Configs> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+
+    void updateCreator(@Param("userId") Long userId, @Param("userName") String userName, @Param("id") Long id);
+}

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/ConfigsService.java

@@ -0,0 +1,15 @@
+package com.usoftchina.saas.commons.service;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.commons.po.Configs;
+import com.usoftchina.saas.page.PageRequest;
+
+public interface ConfigsService {
+    PageInfo getListData(PageRequest page, ListReqDTO req);
+
+    Configs getConfigByCode(String code);
+
+    DocBaseDTO save(Configs data);
+}

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/ConfigsServiceImpl.java

@@ -0,0 +1,92 @@
+package com.usoftchina.saas.commons.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.commons.mapper.ConfigsMapper;
+import com.usoftchina.saas.commons.po.Configs;
+import com.usoftchina.saas.commons.po.Status;
+import com.usoftchina.saas.commons.service.ConfigsService;
+import com.usoftchina.saas.commons.service.MessageLogService;
+import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.page.PageDefault;
+import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.utils.BeanMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+/**
+ * @author: guq
+ * @create: 2018-11-16 11:35
+ **/
+@Service
+public class ConfigsServiceImpl implements ConfigsService{
+
+    @Autowired
+    private ConfigsMapper configsMapper;
+    @Autowired
+    private MessageLogService messageLogService;
+
+
+    @Override
+    public PageInfo getListData(@PageDefault(size = 10) PageRequest page, ListReqDTO req) {
+        Long companyId = BaseContextHolder.getCompanyId();
+        PageHelper.startPage(page.getNumber(), page.getSize());
+        List<Configs> list = configsMapper.selectByCondition(req.getFinalCondition(), companyId);
+        //取分页信息
+        PageInfo<Configs> pageInfo = new PageInfo<Configs>(list);
+        return pageInfo;
+    }
+
+    @Override
+    public Configs getConfigByCode(String code) {
+        if (StringUtils.isEmpty(code)) {
+            return null;
+        }
+        List<Configs> list = configsMapper.selectByCondition(code, BaseContextHolder.getCompanyId());
+        if (null != list && list.size() > 0) {
+            return list.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public DocBaseDTO save(Configs formdata) {
+        if (null == formdata){
+            throw new BizException(50000, "数据为空，请填写后再保存");
+        }
+        //公司ID
+        Long companyId = BaseContextHolder.getCompanyId();
+        //人员Id
+        Long userId = BaseContextHolder.getUserId();
+        String name = BaseContextHolder.getUserName();
+        //返回对象
+        DocBaseDTO baseDTO = null;
+        Long id = formdata.getId();
+
+        //判断更新与保存动作
+        if (StringUtils.isEmpty(id) || "0".equals(id.toString())) {
+            //插入操作
+            formdata.setCompanyId(companyId);
+            configsMapper.insertSelective(formdata);
+            id = formdata.getId();
+            configsMapper.updateCreator(userId, name, id);
+            baseDTO = new DocBaseDTO(id, formdata.getCode(), "Configs");
+            //日志记录
+            messageLogService.save(baseDTO);
+            return baseDTO;
+        }
+
+        //更新操作
+        configsMapper.updateByPrimaryKeySelective(formdata);
+        baseDTO = new DocBaseDTO(id, formdata.getCode(), "Configs");
+        //日志
+        messageLogService.update(baseDTO);
+        return baseDTO;
+    }
+}

applications/commons/commons-server/src/main/resources/mapper/ConfigsMapper.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.commons.mapper.ConfigsMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.commons.po.Configs" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="code" property="code" jdbcType="VARCHAR" />
+    <result column="description" property="description" jdbcType="VARCHAR" />
+    <result column="data" property="data" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+    <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
+    <result column="creatorId" property="creatorId" jdbcType="INTEGER" />
+    <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="updaterName" property="updaterName" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, code, description, data, companyId, creatorName, creatorId, createTime, updaterName
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from configs
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from configs
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.commons.po.Configs" >
+    insert into configs (id, code, description,
+    data, companyId, creatorName,
+    creatorId, createTime, updaterName
+    )
+    values (#{id,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
+    #{data,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{creatorName,jdbcType=VARCHAR},
+    #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updaterName,jdbcType=VARCHAR}
+    )
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.commons.po.Configs" >
+    insert into configs
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="code != null" >
+        code,
+      </if>
+      <if test="description != null" >
+        description,
+      </if>
+      <if test="data != null" >
+        data,
+      </if>
+      <if test="companyId != null" >
+        companyId,
+      </if>
+      <if test="creatorName != null" >
+        creatorName,
+      </if>
+      <if test="creatorId != null" >
+        creatorId,
+      </if>
+      <if test="createTime != null" >
+        createTime,
+      </if>
+      <if test="updaterName != null" >
+        updaterName,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="code != null" >
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null" >
+        #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="data != null" >
+        #{data,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="creatorName != null" >
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
+      <if test="creatorId != null" >
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updaterName != null" >
+        #{updaterName,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.commons.po.Configs" >
+    update configs
+    <set >
+      <if test="code != null" >
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null" >
+        description = #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="data != null" >
+        data = #{data,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="creatorName != null" >
+        creatorName = #{creatorName,jdbcType=VARCHAR},
+      </if>
+      <if test="creatorId != null" >
+        creatorId = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updaterName != null" >
+        updaterName = #{updaterName,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.commons.po.Configs" >
+    update configs
+    set code = #{code,jdbcType=VARCHAR},
+    description = #{description,jdbcType=VARCHAR},
+    data = #{data,jdbcType=VARCHAR},
+    companyId = #{companyId,jdbcType=INTEGER},
+    creatorName = #{creatorName,jdbcType=VARCHAR},
+    creatorId = #{creatorId,jdbcType=INTEGER},
+    createTime = #{createTime,jdbcType=TIMESTAMP},
+    updaterName = #{updaterName,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from configs
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by id desc
+  </select>
+
+  <update id="updateCreator">
+    update configs set creatorId = #{userId} , creatorName=#{userName} where id=#{id}
+  </update>
+
+</mapper>

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

@@ -4,6 +4,8 @@ import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.document.entities.Customer;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 public interface CustomerMapper extends CommonBaseMapper<Customer> {
     int deleteByPrimaryKey(Long cu_id);
 
@@ -27,4 +29,6 @@ public interface CustomerMapper extends CommonBaseMapper<Customer> {
     int validNameAndCodeWhenUpdate(Customer record);
 
     int validFinish(@Param("id") Long id,@Param("companyId") Long companyId);
+
+    void check(Map<String, Object> map);
 }

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

@@ -10,6 +10,7 @@ import com.usoftchina.saas.document.entities.VendorList;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface VendorMapper extends CommonBaseMapper<Vendor> {
 
@@ -28,4 +29,6 @@ public interface VendorMapper extends CommonBaseMapper<Vendor> {
     int getCountByName(@Param("name") String name, @Param("companyId") Long companyId);
 
     int validFinish(@Param("id") Long id,@Param("companyId") Long companyId);
+
+    void check(Map<String, Object> map);
 }

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

@@ -28,9 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by zdw
@@ -55,6 +53,8 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
     private MaxnumberService maxnumberService;
     @Autowired
     private SubledgerMapper subledgerMapper;
+    @Autowired
+    private CustomerMapper customerMapper;
 
 
     @Override
@@ -294,17 +294,28 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
     private void singleDelete(Long id) {
         if (null!=id) {
             DocBaseDTO docBaseDTO = getBaseDTOById(id);
-            //主表删除
-            getMapper().deleteByPrimaryKey(id);
-            //从表删除
-            customercontactMapper.deleteByFK(id);
-            customeraddressMapper.deleteByFK(id);
-
-            //删除中间表
-            subledgerMapper.deleteCustomer("期初余额", "期初余额", Math.toIntExact(id));
-
-            //日志
-            messageLogService.delete(docBaseDTO);
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("v_id",id);
+            map.put("v_code", docBaseDTO.getCode());
+            map.put("v_type","cust");
+            map.put("v_res","");
+            customerMapper.check(map);
+            Object result =  map.get("v_res");
+            if(!StringUtils.isEmpty(result)){
+                throw new BizException(BizExceptionCode.USING_EXISTS.getCode(),result.toString());
+            }else{
+                //主表删除
+                getMapper().deleteByPrimaryKey(id);
+                //从表删除
+                customercontactMapper.deleteByFK(id);
+                customeraddressMapper.deleteByFK(id);
+
+                //删除中间表
+                subledgerMapper.deleteCustomer("期初余额", "期初余额", Math.toIntExact(id));
+
+                //日志
+                messageLogService.delete(docBaseDTO);
+            }
         }
     }
 

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -27,11 +28,10 @@ import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author chenwei
@@ -48,6 +48,8 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
     private MaxnumberService maxnumberService;
     @Autowired
     private SubledgerMapper subledgerMapper;
+    @Autowired
+    private VendorMapper vendorMapper;
 
     @Override
     public PageInfo<VendorDTO> getVendorsByCondition(PageRequest page, ListReqDTO listReqDTO) {
@@ -257,14 +259,24 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
     @Override
     public void deleteById(Long id) {
         if(id != null && id > 0){
-            getMapper().deleteByPrimaryKey(id);
-            vendorcontactMapper.deleteByFK(id);
-            String code = getMapper().getCodeById(id, BaseContextHolder.getCompanyId());
-
-            //删除中间表
-            subledgerMapper.deleteVendor("期初余额", "期初余额", Math.toIntExact(id));
-            //记录LOG
-            messageLogService.delete(generateMsgObj(id, code));
+            String code = getMapper().getCodeById(id, new Long(1));
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("v_id",id);
+            map.put("v_code", code);
+            map.put("v_type","vend");
+            map.put("v_res","");
+            vendorMapper.check(map);
+            Object result =  map.get("v_res");
+            if(!StringUtils.isEmpty(result)){
+                throw new BizException(BizExceptionCode.USING_EXISTS.getCode(),result.toString());
+            }else{
+                getMapper().deleteByPrimaryKey(id);
+                vendorcontactMapper.deleteByFK(id);
+                //删除中间表
+                subledgerMapper.deleteVendor("期初余额", "期初余额", Math.toIntExact(id));
+                //记录LOG
+                messageLogService.delete(generateMsgObj(id, code));
+            }
         }
     }
 

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

@@ -391,7 +391,15 @@
   select count(1) from periodsdetail where pd_status=99 and pd_detno=(select DATE_FORMAT(cu_begindate,'%Y%m') from customer where cu_id =#{id})
   and companyId =#{companyId};
   </select>
-
+  <select id="check" parameterMap="checkParamMap" statementType="CALLABLE">
+        CALL SP_LIMITBASE(?, ?, ?, ?)
+    </select>
+  <parameterMap id="checkParamMap" type="java.util.Map">
+    <parameter property="v_type" jdbcType="VARCHAR" mode="IN" />
+    <parameter property="v_id" jdbcType="INTEGER" mode="IN" />
+    <parameter property="v_code" jdbcType="VARCHAR" mode="IN" />
+    <parameter property="v_res" jdbcType="VARCHAR" mode="OUT" />
+  </parameterMap>
 
 
 </mapper>

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

@@ -477,5 +477,14 @@
         and companyId =#{companyId};
     </select>
 
+    <select id="check" parameterMap="checkParamMap" statementType="CALLABLE">
+        CALL SP_LIMITBASE(?, ?, ?, ?)
+    </select>
+    <parameterMap id="checkParamMap" type="java.util.Map">
+        <parameter property="v_type" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="v_id" jdbcType="INTEGER" mode="IN" />
+        <parameter property="v_code" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="v_res" jdbcType="VARCHAR" mode="OUT" />
+    </parameterMap>
 </mapper>
 

applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -44,10 +44,7 @@
     sa_seller,sa_sellercode,sa_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
-    select 
-    <include refid="Base_Column_List" />
-    from sale
-    where sa_id = #{id}
+    select * from sale where sa_id = #{id}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="long" >
     delete from sale

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/controller/AuthController.java

@@ -124,9 +124,9 @@ public class AuthController {
      * @param info
      * @return
      */
-    @GetMapping("/sso/callback")
+    @GetMapping("/sso/callback/{clientId}")
     public void ssoCallback(HttpServletRequest request, HttpServletResponse response,
-                            String clientId, CookieInfo info) throws IOException{
+                            @PathVariable(required = false) String clientId, CookieInfo info, String callback) throws IOException{
         if (null != info && null != info.getMobile()) {
             AccountDTO accountDTO = null;
             Result<AccountDTO> result = accountApi.getAccount(info.getMobile());
@@ -136,7 +136,7 @@ public class AuthController {
                     accountDTO = createAccountByCookieInfo(info);
                 } else {
                     logger.error(result.getMessage());
-                    ServletErrorUtils.writeMessage(response, "successCallback({success:'0'})");
+                    ServletErrorUtils.writeJsonPMessage(response, callback, false);
                     return;
                 }
             } else {
@@ -147,7 +147,7 @@ public class AuthController {
                     Result updateResult = accountApi.update(BeanMapper.map(accountDTO, AccountUpdateDTO.class));
                     if (!updateResult.isSuccess()) {
                         logger.error(updateResult.getMessage());
-                        ServletErrorUtils.writeMessage(response, "successCallback({success:'0'})");
+                        ServletErrorUtils.writeJsonPMessage(response, callback, false);
                         return;
                     }
                 }
@@ -169,7 +169,7 @@ public class AuthController {
                 TokenDTO tokenDTO = BeanMapper.map(jwtToken, TokenDTO.class);
                 socketMessageApi.sendToClient(clientId, JsonUtils.toJsonString(new AuthDTO(tokenDTO, accountDTO)));
             }
-            ServletErrorUtils.writeMessage(response, "successCallback({success:'1'})");
+            ServletErrorUtils.writeJsonPMessage(response, callback, true);
         }
     }
 

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

@@ -179,7 +179,7 @@ auth:
   public-key: auth/pub.key
   ignores:
     - /api/auth/authorize
-    - /api/auth/sso/callback
+    - /api/auth/sso/callback/**
     - /api/account/account/register
     - /api/auth/info
     - /ws/**

framework/server-starter/src/main/java/com/usoftchina/saas/server/ServerAutoConfiguration.java

@@ -38,7 +38,7 @@ public class ServerAutoConfiguration {
 //                }
 //                logger.error(ServletErrorUtils.buildMessage(request, cause), cause);
 //                try {
-//                    ServletErrorUtils.writerErrorResult(response, cause);
+//                    ServletErrorUtils.writeErrorResult(response, cause);
 //                } catch (IOException ex) {
 //                }
 //                return null;

framework/server-starter/src/main/java/com/usoftchina/saas/server/error/ServletErrorUtils.java

@@ -43,10 +43,39 @@ public class ServletErrorUtils {
      * @throws IOException
      * @throws ServletException
      */
-    public static void writerErrorResult(HttpServletResponse response, Throwable e) throws IOException {
+    public static void writeErrorResult(HttpServletResponse response, Throwable e) throws IOException {
         response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
         PrintWriter writer = response.getWriter();
         writer.print(JsonUtils.toJsonString(Result.throwable(e)));
         writer.flush();
     }
+
+    public static void writeMessage(HttpServletResponse response, String text) throws IOException {
+        response.setContentType(MediaType.TEXT_HTML_VALUE);
+        response.setCharacterEncoding("UTF-8");
+        PrintWriter writer = response.getWriter();
+        writer.print(text);
+        writer.flush();
+    }
+
+    /**
+     * 输出jsonp
+     *
+     * @param response
+     * @param callbackFn
+     * @param success
+     * @throws IOException
+     */
+    public static void writeJsonPMessage(HttpServletResponse response, String callbackFn, boolean success) throws IOException {
+        response.setContentType(MediaType.TEXT_HTML_VALUE);
+        response.setCharacterEncoding("UTF-8");
+        PrintWriter writer = response.getWriter();
+        writer.print(buildJsonPMessage(callbackFn, success));
+        writer.flush();
+    }
+
+    public static String buildJsonPMessage(String callbackFn, boolean success) {
+        return String.format("%s({success:\"%s\"})", callbackFn, success ? 1 : 0);
+    }
+
 }

framework/server-starter/src/main/java/com/usoftchina/saas/server/error/UnCaughtErrorFilter.java

@@ -30,7 +30,7 @@ public class UnCaughtErrorFilter extends OncePerRequestFilter {
                 cause = ((NestedServletException) ex).getRootCause();
             }
             logger.error(ServletErrorUtils.buildMessage(request, cause), cause);
-            ServletErrorUtils.writerErrorResult(response, cause);
+            ServletErrorUtils.writeErrorResult(response, cause);
         }
     }
 }

frontend/saas-portal-web/src/css/main.css

@@ -379,7 +379,7 @@ main > section {
 .ts-mintext {
     position: absolute;
     top: 142px;
-    right: 380px;
+    right: 240px;
     color: white;
 }
 .ts-mintext p {
@@ -392,8 +392,8 @@ main > section {
     margin-left: -40px;
 }
 .ts-lefttext {
-    left: 300px;
-    width: 280px;
+    left: 40px;
+    width: 560px;
 }
 .ts-textleftimg {
     width: 40px;
@@ -434,7 +434,7 @@ main > section {
 .gn-beijing {
     width: 100%;
     position: absolute;
-    top: 242px;
+    top: 247px;
 }
 .gn-img {
     width: 100px;
@@ -467,7 +467,7 @@ main > section {
     left: 0;
 }
 .gn-hei>div {
-    height: 240px;
+    height: 245px;
 }
 .service-item {
     margin-bottom: 60px;
@@ -639,16 +639,15 @@ main > section {
     color: #fff;
 }
 .footer-section .qr{
-    width: 110px;
     overflow: hidden;
     text-align: right;
+    float: right;
 }
 .footer-section .qr .qr-top{
     overflow: hidden;
 }
 .footer-section .qr .qr-code{
-    float: right;
-    width: 90px;
+    width: 110px;
     font-size: 14px;
     color: #fff;
     text-align: center;

frontend/saas-portal-web/src/index.html

@@ -304,7 +304,7 @@
 								<div class="ts-mintext">
 									<p><img class="ts-textimg" src="./img/assets/xunzhao@2x.png" alt="">迅速找到您想要的</p>
 									<p>寻找供应商资源</p>
-									<p>寻找产品资料 货源</p>
+									<p>寻找产品货源  寻找产品资料</p>
 								</div>
 							</div>
 						</div>
@@ -313,8 +313,8 @@
 								<img class="ts-minimg" style="left:0;" src="./img/assets/2.png" alt="">
 								<div class="ts-mintext ts-lefttext">
 									<p>直观看到您想看的<img class="ts-textleftimg" src="./img/assets/fen xi@2x.png" alt=""></p>
-									<p>月度销售额 采购额</p>
-									<p>经营指标实时看</p>
+									<p>每日订单量、收付款、月度销售分析、采购分析</p>
+									<p>让你成为企业经营老司机</p>
 								</div>
 							</div>
 							<div style="margin:50px 0;">
@@ -327,10 +327,10 @@
 							</div>
 							<div class="right right-text">
 								<img class="ts-minimg" src="./img/assets/1.png" alt="">
-								<div class="ts-mintext" style="right: 250px;">
+								<div class="ts-mintext" style="right: 145px;">
 									<p><img class="ts-textimg" src="./img/assets/kuaisu@2x.png" alt="">快速上手 生意简单做</p>
-									<p>移动端的体验</p>
-									<p>简单的业务线 让您三分钟上手</p>
+									<p>移动端的交互体验</p>
+									<p>简短清晰的业务流程 让你三分钟上手</p>
 								</div>
 							</div>
 						</div>
@@ -583,7 +583,7 @@
 						</ul>
 					</div>
 					
-					<div class="qr" style="float:right">
+					<div class="qr">
 						<div class="qr-top">
 							<div class="qr-tech qr-code">
 								<img src="./img/qr-tech.png" alt="">

frontend/saas-web/app/util/BaseUtil.js

@@ -111,7 +111,7 @@ Ext.define('saas.util.BaseUtil', {
             return (/^(\d{4})-(\d{1,2})-(\d{1,2}) (\d{1,2}):(\d{1,2}):(\d{1,2})$/).test(str);
         },
 
-        getCurrentUse: function () {
+        getCurrentUser: function () {
             return saas.util.State.get('session').account;
         },
 

frontend/saas-web/app/view/core/form/ConDateField.js

@@ -12,6 +12,7 @@ Ext.define('saas.view.core.form.ConDateField', {
     defaults: {
         margin: '0 0 0 0'
     },
+    columnWidth: 0.5,
     defaultBindProperty: 'value',
     initComponent : function(){
         this.cls = (this.cls || '') + ' x-form-field-multi';

frontend/saas-web/app/view/core/form/DataMultiCombo.js

@@ -43,7 +43,7 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
                     // }
                 },
                 failure: function (response, opts) {
-                    showToast('上传失败: ' + response.responseText);
+                    saas.util.BaseUtil.showToast('上传失败: ' + response.responseText);
                 }
             });
             me.BaseUtil.request({
@@ -58,7 +58,7 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
             })
             .catch(function(res) {
                 console.error(res);
-                showToast('保存失败: ' + res.message);
+                saas.util.BaseUtil.showToast('保存失败: ' + res.message);
             });
 
             // datas: [

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -203,8 +203,8 @@ Ext.define('saas.view.core.form.FormPanel', {
         viewModel.set(codeField, '');
         viewModel.set('createTime', Ext.Date.format(new Date(), 'Y-m-d H:i:s'));
         viewModel.set('updateTime', Ext.Date.format(new Date(), 'Y-m-d H:i:s'));
-        viewModel.set('creatorId', saas.util.BaseUtil.getCurrentUse().id);
-        viewModel.set('creator', saas.util.BaseUtil.getCurrentUse().realname);
+        viewModel.set('creatorId', saas.util.BaseUtil.getCurrentUser().id);
+        viewModel.set('creatorName', saas.util.BaseUtil.getCurrentUser().realname);
 
         if (statusCodeField) {
             var o = {};

frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -277,7 +277,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
                     .catch(function() {
                         me.fireEvent('validChange');
                         //失败
-                        showToast('删除失败');
+                        saas.util.BaseUtil.showToast('删除失败');
                     });
                 }else {
                     throw new Error();

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -75,11 +75,11 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                         exception: function(proxy, response, operation, eOpts) {
                             if(operation.success) {
                                 if(response.timedout) {
-                                    showToast('请求超时');
+                                    saas.util.BaseUtil.showToast('请求超时');
                                 }
                             }else {
                                 console.error('exception: ', response.responseJson);
-                                showToast('请求错误：' + response.responseJson.message);
+                                saas.util.BaseUtil.showToast('请求错误：' + response.responseJson.message);
                             }
                         }
                     }
@@ -339,7 +339,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             }
         })
         .catch(function(res) {
-            showToast('导出失败: ' + res.message);
+            saas.util.BaseUtil.showToast('导出失败: ' + res.message);
         });
     },
     onCloseOrder:function(me){
@@ -357,7 +357,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 }
             });
         }else{
-            showToast('请勾选至少一条明细。');
+            saas.util.BaseUtil.showToast('请勾选至少一条明细。');
         }
     },
     vastOperation :function(type){
@@ -373,18 +373,18 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             })
             .then(function(res) {
                 if(res.data){
-                    showToast(res.data);
+                    saas.util.BaseUtil.showToast(res.data);
                 }else{
-                    showToast('操作成功');
+                    saas.util.BaseUtil.showToast('操作成功');
                 }
                 me.getStore().loadPage(1);
             })
             .catch(function(res) {
                 console.error(res);
-                showToast('操作失败: ' + res.message);
+                saas.util.BaseUtil.showToast('操作失败: ' + res.message);
             });
         }else{
-            showToast('请勾选至少一条明细。');
+            saas.util.BaseUtil.showToast('请勾选至少一条明细。');
         }
     },
     /** */

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

@@ -56,7 +56,7 @@ Ext.define('saas.view.document.product.BasePanel', {
         ]
         }),
         getCondition: function(value) {
-            if(value == 'ALL') {
+            if(value == 'ALL' || !value) {
                 return '1=1';
             }else {
                 return 'pr_statuscode=\'' + value + '\'';

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

@@ -36,37 +36,37 @@ Ext.define('saas.view.home.InfoCard', {
             title: '七天内待出货销售',
             color: 'yellow',
             viewType: 'sale-sale-querypanel',
-            condition: 'sale.companyid=1 and sa_statuscode=\'AUDITED\' and exists (select 1 from saledetail where sd_said=sa_id and  IFNULL(sd_sendqty,0)<ifnull(sd_qty,0) and TO_DAYS(sd_delivery)-TO_DAYS(now()) <7)'
+            condition: 'sale.companyid=' + saas.util.BaseUtil.getCurrentUser().companyId + ' and sa_statuscode=\'AUDITED\' and exists (select 1 from saledetail where sd_said=sa_id and  IFNULL(sd_sendqty,0)<ifnull(sd_qty,0) and TO_DAYS(sd_delivery)-TO_DAYS(now()) <7)'
         },
         unstorage: {
             title: '七天内待入库采购',
             color: 'purple',
             viewType: 'purchase-purchase-querypanel',
-            condition: 'purchase.companyId=1 and pu_statuscode=\'AUDITED\' and exists (select 1 from purchasedetail where pd_puid=pu_id and IFNULL(pd_acceptqty,0)<ifnull(pd_qty,0) and TO_DAYS(PD_DELIVERY)-TO_DAYS(now()) <7)'
+            condition: 'purchase.companyId=' + saas.util.BaseUtil.getCurrentUser().companyId + ' and pu_statuscode=\'AUDITED\' and exists (select 1 from purchasedetail where pd_puid=pu_id and IFNULL(pd_acceptqty,0)<ifnull(pd_qty,0) and TO_DAYS(PD_DELIVERY)-TO_DAYS(now()) <7)'
         },
         unpay: {
             title: '七天内待付款',
             color: 'red',
             viewType: 'purchase-purchasein-querypanel',
-            condition: 'pi_class in(\'采购验收单\',\'采购验退单\') and prodinout.companyId=1 and TO_DAYS(pi_date+ifnull(ve_promisedays,0))-TO_DAYS(now())<7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=1 and ifnull(sl_namount,0)<>0)'
+            condition: 'pi_class in(\'采购验收单\',\'采购验退单\') and prodinout.companyId=' + saas.util.BaseUtil.getCurrentUser().companyId + ' and TO_DAYS(pi_date+ifnull(ve_promisedays,0))-TO_DAYS(now())<7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=' + saas.util.BaseUtil.getCurrentUser().companyId + ' and ifnull(sl_namount,0)<>0)'
         },
         unreceive: {
             title: '七天内待收款',
             color: 'pink',
             viewType: 'sale-saleout-querypanel',
-            condition: 'pi_class in(\'出货单\',\'销售退货单\') and prodinout.companyId=1 and TO_DAYS(pi_date+ifnull(cu_promisedays,0))-TO_DAYS(now())<7and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=1 and ifnull(sl_namount,0)<>0)'
+            condition: 'pi_class in(\'出货单\',\'销售退货单\') and prodinout.companyId=' + saas.util.BaseUtil.getCurrentUser().companyId + ' and TO_DAYS(pi_date+ifnull(cu_promisedays,0))-TO_DAYS(now())<7and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=1 and ifnull(sl_namount,0)<>0)'
         },
         unauditcheck: {
             title: '未审核验收',
             color: 'blue',
             viewType: 'purchase-purchasein-querypanel',
-            condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'采购验收单\' and prodinout.companyId=1'
+            condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'采购验收单\' and prodinout.companyId=' + saas.util.BaseUtil.getCurrentUser().companyId
         },
         unauditship: {
             title: '未审核出货',
             color: 'default',
             viewType: 'purchase-purchasein-querypanel',
-            condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'出货单\' and prodinout.companyId=1'
+            condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'出货单\' and prodinout.companyId=' + saas.util.BaseUtil.getCurrentUser().companyId
         }
     },
 

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

@@ -41,6 +41,9 @@ $max-card-width: 235px;
                         }
             
                     }
+                    .x-box.x-view-item-focused {
+                        outline: none !important;
+                    }
                 }
             }
         }

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

@@ -182,7 +182,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         hidden:true
     }, {
         xtype : "textfield", 
-        name : "creator", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
@@ -190,6 +190,15 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         name : "createTime",
         fieldLabel : "录入日期",
         readOnly:true
-    }
-    ]
+    },{
+        xtype: 'textfield',
+        name: 'ft_auditman',
+        fieldLabel: '审核人',
+        hidden: true
+    },{
+        xtype: "datefield",
+        name: "ft_auditdate",
+        fieldLabel: "审核日期",
+        hidden: true
+    }]
 });

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

@@ -11,6 +11,16 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         xtype : "textfield",
         name : "ft_code",
         fieldLabel : "单据编号",
+    },{
+        xtype : "textfield",
+        name : "ft_recorder",
+        fieldLabel : "制单人",
+        columnWidth: 0.3
+    },{
+        xtype : "textfield",
+        name : "ft_auditman",
+        fieldLabel : "审核人",
+        columnWidth: 0.3
     },{
         xtype : "condatefield",
         name : "ft_date",
@@ -83,6 +93,10 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             dataIndex: 'ft_recorder',
             width: 120
         }, {
+            text: '审核人',
+            dataIndex: 'ft_auditman',
+            width: 120
+        },{
             text: '转出账户',
             dataIndex: 'ftd_bankname',
             width: 120

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

@@ -160,7 +160,15 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         name : "or_recorddate",
         fieldLabel : "录入日期",
         readOnly:true
-    }
-
-    ]
+    },{
+        xtype: 'textfield',
+        name: 'or_auditman',
+        fieldLabel: '审核人',
+        hidden: true
+    },{
+        xtype: "datefield",
+        name: "or_auditdate",
+        fieldLabel: "审核日期",
+        hidden: true
+    }]
 });

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

@@ -30,14 +30,14 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         name: 'or_custname',
         fieldLabel: '客户名称',
     }, {
-        xtype : 'hidden',
-        name : 'or_bankid', 
-        fieldLabel : '账户ID'
-     }, {
-        xtype: 'hidden',
-        name: 'or_bankcode',
-        fieldLabel: '账户编号'
-    }, {
+        xtype: 'textfield',
+        name: 'or_recorder',
+        fieldLabel: '制单人'
+    },{
+        xtype: 'textfield',
+        name: 'or_auditman',
+        fieldLabel: '审核人'
+    },  {
         xtype: 'dbfindtrigger',
         name: 'or_bankname',
         fieldLabel: '账户名称'
@@ -97,7 +97,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             dataIndex: 'or_bankname',
             width: 120
         },{
-            text: '金额',
+            text: '收款金额',
             xtype: 'numbercolumn',
             dataIndex: 'or_amount',
             width: 120,
@@ -111,6 +111,10 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             text: '录入人',
             dataIndex: 'or_recorder',
             width: 120
+        },{
+            text: '审核人',
+            dataIndex: 'or_auditman',
+            width: 120
         }, {
             text: '收入类别',
             dataIndex: 'ord_type',

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

@@ -160,6 +160,15 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         name : "os_recorddate",
         fieldLabel : "录入日期",
         readOnly:true
-    }
-    ]
+    },{
+        xtype: 'textfield',
+        name: 'os_auditman',
+        fieldLabel: '审核人',
+        hidden: true
+    },{
+        xtype: "datefield",
+        name: "os_auditdate",
+        fieldLabel: "审核日期",
+        hidden: true
+    }]
 });

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

@@ -30,13 +30,15 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         name: 'os_vendname',
         fieldLabel: '供应商名称'
     }, {
-        xtype : 'hidden',
-        name : 'os_bankid', 
-        fieldLabel : '结算账户ID'
-     }, {
+        xtype: 'textfield',
+        name: 'os_recorder',
+        fieldLabel: '制单人',
+        columnWidth: 0.3,
+    }, {
         xtype: 'hidden',
-        name: 'os_bankcode',
-        fieldLabel: '结算账户编号'
+        name: 'os_auditman',
+        fieldLabel: '审核人',
+        columnWidth: 0.3,
     }, {
         xtype: 'dbfindtrigger',
         name: 'os_bankname',

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

@@ -374,6 +374,16 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: 'hidden',
         name: 'pb_text5',
         fieldLabel: '自定义字段5'
+    },{
+        xtype: 'textfield',
+        name: 'pb_auditman',
+        fieldLabel: '审核人',
+        hidden: true
+    },{
+        xtype: "datefield",
+        name: "pb_auditdate",
+        fieldLabel: "审核日期",
+        hidden: true
     }],
 
     beforeAudit: function() {

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

@@ -343,6 +343,16 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         name: "rb_recorddate",
         fieldLabel: "录入日期",
         hidden: true
+    }, {
+        xtype: 'textfield',
+        name: 'rb_auditman',
+        fieldLabel: '审核人',
+        hidden: true
+    },{
+        xtype: "datefield",
+        name: "rb_auditdate",
+        fieldLabel: "审核日期",
+        hidden: true
     }],
 
     beforeAudit: function() {

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

@@ -38,10 +38,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         xtype: 'hidden',
         name: 'id',
         fieldLabel: 'id'
-    },{
-        xtype: 'numberfield',
-        name: 'pi_ioid',
-        fieldLabel: 'pi_ioid'
     },{
         xtype : "hidden", 
         name : "pu_vendid", 
@@ -359,7 +355,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     },
     {
         xtype : "textfield", 
-        name : "creator", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
@@ -375,7 +371,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         readOnly:true
     },{
         xtype : "hidden", 
-        name : "updater", 
+        name : "updaterName", 
         fieldLabel : "更新人", 
         readOnly:true
     }, {

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

@@ -143,7 +143,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 0
         }, {
             text: '录入人',
-            dataIndex: 'creator',
+            dataIndex: 'creatorName',
             width: 0
         }, {
             text: '录入日期',

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

@@ -350,7 +350,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     },
     {
         xtype : "textfield", 
-        name : "creator", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
@@ -366,7 +366,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         readOnly:true
     },{
         xtype : "hidden", 
-        name : "updater", 
+        name : "updaterName", 
         fieldLabel : "更新人", 
         readOnly:true
     }, {

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

@@ -133,7 +133,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             width: 0
         }, {
             text: '录入人',
-            dataIndex: 'creator',
+            dataIndex: 'creatorName',
             width: 0
         }, {
             text: '录入日期',
@@ -146,7 +146,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             width: 0
         }, {
             text: '更新人',
-            dataIndex: 'updater',
+            dataIndex: 'updaterName',
             width: 0
         }, {
             text: '更新日期',

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

@@ -335,7 +335,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     },
     {
         xtype : "textfield", 
-        name : "creator", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
@@ -351,7 +351,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         readOnly:true
     },{
         xtype : "hidden", 
-        name : "updater", 
+        name : "updaterName", 
         fieldLabel : "更新人", 
         readOnly:true
     }, {

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

@@ -137,7 +137,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             width: 0
         }, {
             text: '录入人',
-            dataIndex: 'creator',
+            dataIndex: 'creatorName',
             width: 0
         }, {
             text: '录入日期',
@@ -150,7 +150,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             width: 0
         }, {
             text: '更新人',
-            dataIndex: 'updater',
+            dataIndex: 'updaterName',
             width: 0
         }, {
             text: '更新日期',

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

@@ -44,7 +44,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         width: 200
     }, {
         text: '录入人',
-        dataIndex: 'creator',
+        dataIndex: 'creatorName',
         width: 200
     }, {
         text : "日期", 

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

@@ -316,7 +316,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         readOnly:true
      }, {
         xtype : "textfield", 
-        name : "sa_recorder", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {

frontend/saas-web/app/view/sys/baseconfig/FormPanel.js

@@ -188,7 +188,7 @@ Ext.define('saas.view.sys.baseconfig.FormPanel', {
                         },
                         success: function (response, opts) {
                             form.setLoading(false);
-                            showToast('上传成功');
+                            saas.util.BaseUtil.showToast('上传成功');
                             var res = Ext.decode(response.responseText);
                             if(res.success){
                                 var data = res.data;
@@ -196,13 +196,13 @@ Ext.define('saas.view.sys.baseconfig.FormPanel', {
                                 myForm.down('[name=signet]').setValue(data.id);
                                 field.setRawValue(name);
                             }else{
-                                showToast('上传失败: ' + res.message);
+                                saas.util.BaseUtil.showToast('上传失败: ' + res.message);
                             }
                         },
                         failure: function (response, opts) {
                             form.setLoading(false);
                             var res = Ext.decode(response.responseText);
-                            showToast('上传失败: ' + res.message);
+                            saas.util.BaseUtil.showToast('上传失败: ' + res.message);
                         }
                     });
                 }
@@ -270,7 +270,7 @@ Ext.define('saas.view.sys.baseconfig.FormPanel', {
                         },
                         success: function (response, opts) {
                             form.setLoading(false);
-                            showToast('上传成功');
+                            saas.util.BaseUtil.showToast('上传成功');
                             var res = Ext.decode(response.responseText);
                             if(res.success){
                                 var data = res.data;
@@ -278,13 +278,13 @@ Ext.define('saas.view.sys.baseconfig.FormPanel', {
                                 myForm.down('[name=logoUrl]').setValue(data.id);
                                 field.setRawValue(name);
                             }else{
-                                showToast('上传失败: ' + res.message);
+                                saas.util.BaseUtil.showToast('上传失败: ' + res.message);
                             }
                         },
                         failure: function (response, opts) {
                             form.setLoading(false);
                             var res = Ext.decode(response.responseText);
-                            showToast('上传失败: ' + res.message);
+                            saas.util.BaseUtil.showToast('上传失败: ' + res.message);
                         }
                     });
                 }

frontend/saas-web/app/view/sys/baseconfig/FormPanelController.js

@@ -22,12 +22,12 @@ Ext.define('saas.view.sys.baseconfig.FormPanelController', {
 
         var valid = form.isValid();
         if(!valid) {
-            showToast('表单校验有误，请检查');
+            saas.util.BaseUtil.showToast('表单校验有误，请检查');
             return false;
         }
 
         if(form.getForm().wasDirty==false){
-            showToast('未修改数据，请修改后保存');
+            saas.util.BaseUtil.showToast('未修改数据，请修改后保存');
             return false;
         }
         
@@ -42,7 +42,7 @@ Ext.define('saas.view.sys.baseconfig.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                showToast('保存成功');
+                saas.util.BaseUtil.showToast('保存成功');
                 viewModel = form.getViewModel();
                 var url = form._readUrl;
                 form.BaseUtil.request({url })
@@ -59,7 +59,7 @@ Ext.define('saas.view.sys.baseconfig.FormPanelController', {
         })
         .catch(function(res) {
             console.error(res);
-            showToast('保存失败: ' + res.message);
+            saas.util.BaseUtil.showToast('保存失败: ' + res.message);
         });
     }
 

frontend/saas-web/app/view/sys/config/FormPanel.js

@@ -185,7 +185,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                         },
                         success: function (response, opts) {
                             form.setLoading(false);
-                            showToast('上传成功');
+                            saas.util.BaseUtil.showToast('上传成功');
                             var res = Ext.decode(response.responseText);
                             if(res.success){
                                 var data = res.data;
@@ -193,13 +193,13 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                 myForm.down('[name=signet]').setValue(data.id);
                                 field.setRawValue(name);
                             }else{
-                                showToast('上传失败: ' + res.message);
+                                saas.util.BaseUtil.showToast('上传失败: ' + res.message);
                             }
                         },
                         failure: function (response, opts) {
                             form.setLoading(false);
                             var res = Ext.decode(response.responseText);
-                            showToast('上传失败: ' + res.message);
+                            saas.util.BaseUtil.showToast('上传失败: ' + res.message);
                         }
                     });
                 }
@@ -271,7 +271,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                         },
                         success: function (response, opts) {
                             form.setLoading(false);
-                            showToast('上传成功');
+                            saas.util.BaseUtil.showToast('上传成功');
                             var res = Ext.decode(response.responseText);
                             if(res.success){
                                 var data = res.data;
@@ -279,13 +279,13 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                 myForm.down('[name=logoUrl]').setValue(data.id);
                                 field.setRawValue(name);
                             }else{
-                                showToast('上传失败: ' + res.message);
+                                saas.util.BaseUtil.showToast('上传失败: ' + res.message);
                             }
                         },
                         failure: function (response, opts) {
                             form.setLoading(false);
                             var res = Ext.decode(response.responseText);
-                            showToast('上传失败: ' + res.message);
+                            saas.util.BaseUtil.showToast('上传失败: ' + res.message);
                         }
                     });
                 }