merge

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

@@ -65,12 +65,12 @@ public enum Operation {
     /**
      * 转采购验收单
      */
-    PURCHASEIN("msg.TurnPurcCheckin", "msg.TurnPurcCheckinSuccess"),
+    PURCHASEIN("msg.turnPurcCheckin", "msg.turnPurcCheckinSuccess"),
 
     /**
      * 转采购验退单
      */
-    PURCHASEOUT("msg.TurnPurcCheckout", "msg.TurnPurcCheckoutSuccess"),
+    PURCHASEOUT("msg.turnPurcCheckout", "msg.turnPurcCheckoutSuccess"),
 
     /**
      * 转出货单

applications/commons/commons-server/src/main/resources/i18n/messages_zh_CN.properties

@@ -119,4 +119,8 @@ msg.getSuccess=\u83b7\u53d6\u6210\u529f
 msg.endProdudct=\u7ed3\u8d26\u64cd\u4f5c
 msg.endProdudctSuccess=\u7ed3\u8d26\u6210\u529f
 msg.unEndProduct=\u53cd\u7ed3\u8d26\u64cd\u4f5c
-msg.unEndProductSuccess=\u53cd\u7ed3\u8d26\u6210\u529f
+msg.unEndProductSuccess=\u53cd\u7ed3\u8d26\u6210\u529f
+msg.turnPurcCheckin=\u8F6C\u6570\u91C7\u8D2D\u9A8C\u6536\u5355\u64CD\u4F5C
+msg.turnPurcCheckinSuccess=\u8F6C\u6570\u91C7\u8D2D\u9A8C\u6536\u5355\u64CD\u4F5C\u6210\u529F
+msg.turnPurcCheckout=\u8F6C\u91C7\u8D2D\u9A8C\u9000\u5355\u64CD\u4F5C
+msg.turnPurcCheckoutSuccess=\u8F6C\u91C7\u8D2D\u9A8C\u9000\u5355\u64CD\u4F5C\u6210\u529F

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

@@ -24,5 +24,6 @@ public interface BankinformationMapper extends CommonBaseMapper<Bankinformation>
 
     List<ComboDTO> getCombo(@Param("companyId") Long companyId);
     String selectBankcode(String bk_bankcode);
+    Long selectBankId(String bk_bankcode);
 
 }

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

@@ -43,12 +43,28 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         bankinformation.setBk_income(new Double(0));
         bankinformation.setBk_spending(new Double(0));
 
-        //判断编号
         String bktion = bankinformationMapper.selectBankcode(bankinformation.getBk_bankcode());
-        if (bktion != null){
-            throw new BizException(500, BizExceptionCode.ACCOUNT_EXISTS.getMessage());
+        //先判断ID,再判断编号
+        if (bankinformation.getId() == 0)
+        {
+            if (bktion != null){
+                throw new BizException(500, BizExceptionCode.ACCOUNT_EXISTS.getMessage());
+            }
+            bankinformationMapper.insertSelective(bankinformation);
+        }else {
+            if (bktion != null){
+                Long id = bankinformationMapper.selectBankId(bankinformation.getBk_bankcode());
+                if (id.equals(bankinformation.getId())){
+                    bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
+                }else {
+                    throw new BizException(500, BizExceptionCode.ACCOUNT_EXISTS.getMessage());
+                }
+            }else {
+                bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
+            }
         }
 
+
         //中间表
         Banksubledger banksubledger = new Banksubledger();
         Date date = bankinformation.getBk_date();
@@ -75,10 +91,8 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         banksubledger.setBl_orderamount(bankinformation.getBk_beginamount());
 
         if(bankinformation.getId() == 0){
-            bankinformationMapper.insertSelective(bankinformation);
             banksubledgerMapper.insertSelective(banksubledger);
         }else{
-            bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
             banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
         }
         return true;

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

@@ -298,6 +298,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
             map.put("v_id",id);
             map.put("v_code", docBaseDTO.getCode());
             map.put("v_type","cust");
+            map.put("v_companyid",BaseContextHolder.getCompanyId());
             map.put("v_res","");
             customerMapper.check(map);
             Object result =  map.get("v_res");

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

@@ -123,16 +123,18 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             if (productDetailList.size() > 0){
                 //找到原始单据,反过账并删除
                 String inoutCode = getMapper().selectProdIOCode(product.getPr_code(), BaseContextHolder.getCompanyId(), "库存初始化");
-                post(inoutCode, "反过账");
-                getMapper().deleteProdIODetailByCode(inoutCode, BaseContextHolder.getCompanyId());
-                getMapper().deleteProdIOByCode(inoutCode, BaseContextHolder.getCompanyId());
-
+                if (!StringUtils.isEmpty(inoutCode)) {
+                    post(inoutCode, "反过账");
+                    getMapper().deleteProdIODetailByCode(inoutCode, BaseContextHolder.getCompanyId());
+                    getMapper().deleteProdIOByCode(inoutCode, BaseContextHolder.getCompanyId());
+                }
                 //此种情况不可能发生明细行数量,只会发生明细行数据修改/新增明细行
                 //a.更新明细行数据
                 List<ProductDetail> insertItems = new ArrayList<ProductDetail>();
                 List<ProductDetail> updateItems = new ArrayList<ProductDetail>();
                 for(ProductDetail productDetail : productDetailList){
                     if (productDetail.getId() == 0){
+                        productDetail.setPd_prodid(product.getId());
                         productDetail.setUpdaterId(userId);
                         productDetail.setUpdateTime(new Date());
                         insertItems.add(productDetail);
@@ -373,8 +375,8 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         validEnableDel(id);
 
         String code = getMapper().getCodeById(id);
-        getMapper().deleteByPrimaryKey(id);
         productDetailMapper.deleteByProdId(id);
+        getMapper().deleteByPrimaryKey(id);
         DocBaseDTO docBaseDTO = generateMsgObj(id, code);
         //记录LOG
         messageLogService.delete(docBaseDTO);

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

@@ -264,14 +264,15 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             map.put("v_id",id);
             map.put("v_code", code);
             map.put("v_type","vend");
+            map.put("v_companyid",BaseContextHolder.getCompanyId());
             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);
+                getMapper().deleteByPrimaryKey(id);
                 //删除中间表
                 subledgerMapper.deleteVendor("期初余额", "期初余额", Math.toIntExact(id));
                 //记录LOG

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

@@ -339,4 +339,8 @@
   <select id="selectBankcode" parameterType="java.lang.String" resultType="java.lang.String">
         select bk_bankcode from bankinformation where bk_bankcode = #{bk_bankcode,jdbcType=VARCHAR}
     </select>
+
+  <select id="selectBankId" parameterType="java.lang.String" resultType="java.lang.Long">
+        select bk_id from bankinformation where bk_bankcode = #{bk_bankcode,jdbcType=VARCHAR}
+    </select>
 </mapper>

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

@@ -392,12 +392,13 @@
   and companyId =#{companyId};
   </select>
   <select id="check" parameterMap="checkParamMap" statementType="CALLABLE">
-        CALL SP_LIMITBASE(?, ?, ?, ?)
+        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_companyid" jdbcType="VARCHAR" mode="IN" />
     <parameter property="v_res" jdbcType="VARCHAR" mode="OUT" />
   </parameterMap>
 

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

@@ -478,12 +478,13 @@
     </select>
 
     <select id="check" parameterMap="checkParamMap" statementType="CALLABLE">
-        CALL SP_LIMITBASE(?, ?, ?, ?)
+        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_companyid" jdbcType="VARCHAR" mode="IN" />
         <parameter property="v_res" jdbcType="VARCHAR" mode="OUT" />
     </parameterMap>
 </mapper>

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutDTO.java

@@ -35,13 +35,15 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private String pi_pucode;
 
-    private Integer pi_said;
+    private Long pi_said;
 
     private String pi_sacode;
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 
@@ -75,4 +77,8 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Long pi_ioid;
 
+    private String pi_macode;
+
+    private Long pi_maid;
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/ProdInOutMapper.java

@@ -23,7 +23,7 @@ public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
 
     int checkQtyFromPurchase(String pu_code);
 
-    int checkQtyFromProdIn(String pu_code);
+    int checkQtyFromProdIn(Long id);
 
     void updateCreator(@Param("userId") Long userId,@Param("userName") String userName,@Param("id") Long pi_id);
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOut.java

@@ -8,6 +8,7 @@ import java.util.Date;
 @Data
 public class ProdInOut extends CommonBaseEntity implements Serializable {
 
+
     private String pi_inoutno;
 
     private String pi_class;
@@ -30,13 +31,15 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_pucode;
 
-    private Integer pi_said;
+    private Long pi_said;
 
     private String pi_sacode;
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 
@@ -70,4 +73,8 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private Long pi_ioid;
 
+    private String pi_macode;
+
+    private Long pi_maid;
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -205,10 +205,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         }
 
         //检查更新后数据是否
-        String pu_code = prodInOut.getPi_pucode();
-        if (!StringUtils.isEmpty(pu_code)){
-            checkUpdateQty(pu_code,pi_class);
-        }
+        checkUpdateQty(pi_id,pi_class);
 
         baseDTO = getBaseDTOById(pi_id,pi_class,pi_inoutno);
         //计算金额，未税单价，未税金额等
@@ -390,10 +387,10 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         }
     }
 
-    private void checkUpdateQty(String pu_code, String pi_class) {
+    private void checkUpdateQty(Long id, String pi_class) {
         int count = 0;
         if ("采购验退单".equals(pi_class)) {
-            count = getMapper().checkQtyFromProdIn(pu_code);
+            count = getMapper().checkQtyFromProdIn(id);
             if (count>0){
                 throw new BizException(BizExceptionCode.PURCHASE_DETAIL_OVERNUM);
             }
@@ -501,12 +498,11 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                  prodIODetailMapper.updateByPrimaryKeySelective(sourcePid);
              }
          }
-        //更新默认仓库
-//        getDefaultWarehouseByProduct(pi_id);
         //采购验退单相关计算
         calcProdInout(pi_id,"采购验退单");
+        DocBaseDTO baselog = new DocBaseDTO(sourcePi.getId(), sourcePi.getPi_inoutno(), BillCodeSeq.PURCHASEIN.getCaller());
+        messageLogService.customizeLog(baselog, Operation.PURCHASEOUT);
         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.PURCHASEOUT.getName());
-        messageLogService.customizeLog(baseDTO, Operation.PURCHASEOUT);
         return Result.success(baseDTO);
     }
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -486,12 +486,12 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purchasedetailMapper.updateByPrimaryKeySelective(purchaseDetail);
             }
         }
-        //更新默认仓库
-//        prodInOutService.getDefaultWarehouseByProduct(pi_id);
         //采购验收单相关计算
         prodInOutService.calcProdInout(pi_id,"采购验收单");
+        //日志记录到采购单
+        DocBaseDTO baselog = new DocBaseDTO(purchase.getId(), purchase.getPu_code(), BillCodeSeq.PURCHASE.getCaller());
+        messageLogService.customizeLog(baselog, Operation.PURCHASEIN);
         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.PURCHASEIN.getName());
-        messageLogService.customizeLog(baseDTO, Operation.PURCHASEIN);
         return Result.success(baseDTO);
     }
 
@@ -510,7 +510,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setPu_acceptstatuscode(Status.UNAUDITED.name());
         purchase.setUpdateTime(new Date());
         purchase.setUpdaterId(BaseContextHolder.getUserId());
-        getMapper().updateByPrimaryKey(purchase);
+        getMapper().updateByPrimaryKeySelective(purchase);
         //更新存在字段
         //日志
         messageLogService.audit(docBaseDTO);

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -432,9 +432,9 @@
   GROUP BY pd_orderid) t  where t.nowqty>t.totalqty
   </select>
 
-  <select id="checkQtyFromProdIn" resultType="int" parameterType="string">
+  <select id="checkQtyFromProdIn" resultType="int" parameterType="long">
   select count(1) from(
-  select sum(b.pd_outqty) nowqty,(select a.pd_inqty from prodiodetail a where a.pd_id = b.pd_ioid and a.pd_piclass='采购验收单') totalqty from prodiodetail b where b.pd_ordercode=#{pu_code} and b.pd_piclass='采购验退单'
+  select sum(b.pd_outqty) nowqty,(select a.pd_inqty from prodiodetail a where a.pd_id = b.pd_ioid and a.pd_piclass='采购验收单') totalqty from prodiodetail b where b.pd_piid = #{id} and b.pd_piclass='采购验退单'
   GROUP BY b.pd_ioid) t where t.nowqty>t.totalqty
   </select>
 

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseMapper.xml

@@ -110,9 +110,6 @@
       <if test="pu_totalupper != null" >
         PU_TOTALUPPER,
       </if>
-      <if test="createTime != null" >
-        PU_INDATE,
-      </if>
       <if test="pu_printstatus != null" >
         PU_PRINTSTATUS,
       </if>
@@ -144,13 +141,13 @@
         updateTime,
       </if>
       <if test="creatorId != null" >
-      creatorId,
+        creatorId,
       </if>
       <if test="creatorName != null" >
         creatorName,
       </if>
       <if test="createTime != null" >
-      createTime,
+        createTime,
       </if>
       <if test="pu_text1 != null" >
         pu_text1,
@@ -211,9 +208,6 @@
       <if test="pu_totalupper != null" >
         #{pu_totalupper,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null" >
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="pu_printstatus != null" >
         #{pu_printstatus,jdbcType=VARCHAR},
       </if>
@@ -246,26 +240,27 @@
       </if>
       <if test="creatorId != null" >
        #{creatorId,jdbcType=INTEGER},
-      </if><if test="createTime != null" >
-       #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="creatorName != null" >
-       #{creatorName,jdbcType=VARCHAR},
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+       #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="pu_text1 != null" >
         #{pu_text1,jdbcType=VARCHAR},
       </if>
       <if test="pu_text2 != null" >
-        #{pu_text1,jdbcType=VARCHAR},
+        #{pu_text2,jdbcType=VARCHAR},
       </if>
       <if test="pu_text3 != null" >
-        #{pu_text1,jdbcType=VARCHAR},
+        #{pu_text3,jdbcType=VARCHAR},
       </if>
       <if test="pu_text4 != null" >
-        #{pu_text1,jdbcType=VARCHAR},
+        #{pu_text4,jdbcType=VARCHAR},
       </if>
       <if test="pu_text5 != null" >
-        #{pu_text1,jdbcType=VARCHAR},
+        #{pu_text5,jdbcType=VARCHAR},
       </if>
       <if test="pu_shipaddresscode != null" >
         #{pu_shipaddresscode,jdbcType=LONGVARCHAR},

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutDTO.java

@@ -33,7 +33,7 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private String pi_custname;
 
-    private Integer pi_puid;
+    private Long pi_puid;
 
     private String pi_pucode;
 
@@ -43,7 +43,9 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOut.java

@@ -31,13 +31,15 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_pucode;
 
-    private Integer pi_said;
+    private Long pi_said;
 
     private String pi_sacode;
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/ProdInOutServiceImpl.java

@@ -131,8 +131,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOut.setCreatorId(userId);
         prodInOut.setCreateTime(prodInOut.getPi_recorddate()==null?new Date():prodInOut.getPi_recorddate());
         prodInOut.setPi_date(prodInOut.getPi_date()==null?new Date():prodInOut.getPi_date());
-        prodInOut.setPi_puid(main.getPi_puid());
-        prodInOut.setPi_pucode(main.getPi_pucode());
         //编号获取
         pi_inoutno = pushMaxnubmer(prodInOut);
         prodInOut.setPi_inoutno(pi_inoutno);

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

@@ -318,7 +318,7 @@ public class AccountController {
      * @return
      */
     @PostMapping("/bind/roles")
-    public Result bindRoles(@RequestParam long accountId, @RequestParam String roleIds) {
+    public Result bindRoles(@RequestParam("accountId") Long accountId, @RequestParam("roleIds") String roleIds) {
         accountService.bindRoles(accountId, roleIds);
         accountService.clearCache(accountId);
         return Result.success();

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

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

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

@@ -104,6 +104,10 @@ spring:
         - Path=/api/commons/**
         filters:
         - RewritePath=/api/commons/(?<segment>.*), /$\{segment}
+      - id: SOCKET-SERVER
+        uri: lb:ws://SOCKET-SERVER
+        predicates:
+        - Path=/ws/**
   redis:
     host: 192.168.253.12
     port: 6379
@@ -175,6 +179,8 @@ auth:
   public-key: auth/pub.key
   ignores:
     - /api/auth/authorize
+    - /api/auth/sso/callback/**
     - /api/account/account/register
     - /api/auth/info
+    - /ws/**
     - /api/file/download

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -242,6 +242,7 @@ Ext.define('saas.view.core.base.GridPanel', {
         if(columns[columns.length - 1].flex != 1) {
             columns.push({
                 flex: 1,
+                dataIndex:'virtual',
                 allowBlank: true
             });
         }

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

@@ -162,7 +162,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
 
     judge:function(f){
-        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1){
+        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1||f.ownerCt.ownerCt.xtype.trim().toUpperCase().indexOf('BASEPANEL')>-1){
             f.belong = 'form';
             return f.ownerCt.ownerCt
         }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORM')>-1){

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

@@ -125,7 +125,11 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
         datas = me.datas,
         menu = me.menu;
         if(!Ext.isArray(items)) {
-            items = [items]
+            if(items.indexOf(',')>0){
+                items = items.split(',')
+            }else{
+                items = [items]
+            }
         }
         items.map(function(item, index) {
             if(Ext.isString(item)) {

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

@@ -132,7 +132,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         modelData = viewModel.getData();
 
         //form里面数据
-        var formData = form.getFormData();
+        var formData = form.getDirtyData();
 
         var params = {
             main:formData.main

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

@@ -34,10 +34,10 @@ Ext.define('saas.view.core.form.RemoteCombo', {
     },
     createPicker: function() {
         var me = this,
-            picker,
-            pickerCfg = Ext.apply({
-                maxHeight: 180,
-                minHeight: 0,
+            picker;
+        var count = this.store.getCount();
+        var pickerCfg = Ext.apply({
+                height: count>5?150:30*count,
                 hiddenBtn:me.hiddenBtn,
                 xtype: 'boundlistadd',
                 id: me.id + '-picker',

frontend/saas-web/app/view/core/view/BoundListAdd.js

@@ -254,7 +254,7 @@ Ext.define('saas.view.core.view.BoundListAdd', {
             id: me.id + '-toolbar',
             border: true,
             ownerCt: me,
-            hidden:me.hiddenBtn,
+            height:me.hiddenBtn?0:50,
             items:[{
                 text:'新增',
                 handler:me.addHandler,

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

@@ -97,7 +97,6 @@ Ext.define('saas.view.document.customer.BasePanel', {
         codeField: 'cu_code',
         statusCodeField:'cu_statuscode',
         dataUrl: '/api/document/customer/list',
-        //dataUrl: 'http://192.168.253.31:8560/api/document/customer/list',
         columns : [
         {
             text : "客户id", 

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -318,7 +318,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 fieldLabel: '单据前缀',
                 name: 'mn_leadcode',
                 beforeLabelTextTpl: '',
-                allowBlank:false,
+                allowBlank:true,
                 maxLength: 20
             },{
                 xtype:'combo',
@@ -473,21 +473,17 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         saas.util.BaseUtil.request({
             url: belong.reqUrl,
             params: _params,
-            method: 'POST'
+            method: 'POST',
+            headers:{
+                'Access-Control-Allow-Origin': '*',
+                "Content-Type":'application/x-www-form-urlencoded'
+            }
         })
         .then(function(localJson) {
             me.setLoading(false);
             if(localJson.success){
                 saas.util.BaseUtil.showToast('保存成功');
-                var grid = form.ownerCt._parent.lookup('document-kind-Grid');
-                if(grid){
-                    grid.store.load();
-                }
-                if(combo){
-                    combo.store.load(function() {
-                        typeof combo.setValue == 'function' && combo.setValue(params._value);
-                    });
-                }
+                form.ownerCt._parent.store.load()
                 form.ownerCt.close();
             }
         })

frontend/saas-web/app/view/document/kind/Kind.js

@@ -256,7 +256,7 @@ Ext.define('saas.view.document.kind.Kind', {
             },{
                 dataIndex: 'email',
             }],
-            reqUrl:'http://192.168.253.31:8560/api/account/account/bind/roles',
+            reqUrl:'/api/account/account/bind/roles',
         },
         warehouse:{
             columns: [{

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

@@ -75,7 +75,6 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         codeField: 've_code',
         statusCodeField:'ve_statuscode',
         dataUrl: '/api/document/vendor/list',
-        //dataUrl: 'http://192.168.253.31:8560/api/document/vendor/list',
         columns : [{
             text : "供应商id", 
             width : 0, 

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

@@ -221,26 +221,42 @@ body > .x-mask {
     filter: grayscale(100%);
     filter: gray;
 }
+ .x-main-menu{
+    background: #f8fbff;
+    border: 2px solid #34baf6;
+ }
+ .x-main-menu .x-menu-item-text-default{
+    font-family: PingFangSC-Regular;
+    //font-size: 14px;
+    color: #34BAF6;
+    letter-spacing: 0;
+    text-align: center;
+ }
 .x-main-menu::before{
     content: ' ';
     display: block;
     border-style: solid;
-    box-shadow: 0px 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(15, 136, 232, 0.6);
+    background-color: white;
+    transform: rotate(45deg);
+    box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(15, 136, 232, 0.6);
     box-shadow: aliceblue;
-    border-width: 17px;
-    border-color: #cccccc;
+    border-width: 2px;
+    border-color: #34BAF6;
     /* border-color: #cccccc #6e838e #9c9d9e #bdc3c5; */
     position: fixed;
+    width: 14px;
+    height: 14px;
     /* left: 100%; */
-    top: 26px;
+    top: 25px;
     -moz-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
-    -webkit-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
+    /* -webkit-clip-path: polygon(100% 0px, 0 50%, 100% 100%); */
     -o-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
     -ms-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
     -khtml-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
-    clip-path: polygon(0 100%, 50% 0, 100% 100%);
+    clip-path: polygon(0% 0,100% 0%,0 100%);
     margin-top: 17px;
     margin-left: 7px;
+    z-index: 99;
 }
 .x-main-menu2::before{
     content: ' ';

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
     caller:'FundTransfer',
     
      //字段属性
-     _title:'资金转账',
+     _title:'资金转存',
      _idField: 'id',
      _codeField: 'ft_code',
      _statusField: 'ft_status',
@@ -81,6 +81,10 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     valueField : "value", 
                     xtype : "bandinfoDbfindTrigger"
                 }
+            },{
+                text : "转出账户余额", 
+                dataIndex : "bk_outthisamount", 
+                ignore:true
             }, {
                 text : "转入账户ID", 
                 dataIndex : "ftd_inbankid", 
@@ -108,11 +112,15 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     valueField : "value", 
                     xtype : "bandinfoDbfindTrigger"
                 }
+            },{
+                text : "转入账户余额", 
+                dataIndex : "bk_inthisamount", 
+                ignore:true
             }, {
-                text : "金额", 
+                text : "本次转出金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "ftd_nowbalance", 
-                width : 120.0, 
+                width : 150.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2
@@ -131,15 +139,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     return Ext.util.Format.number(v, format);
                 }
             }, {
-                text : "结算方式号", 
-                dataIndex : "ftd_paycode", 
-                width : 100,
-                editor:{
-                    xtype: ''  
-                }
-            }, {
-                text : "结算方式", 
-                width : 150.0, 
+                text : "结算方式",
+                width : 150.0,
                 dataIndex : "ftd_paymethod",
                 editor : {
                     xtype:'combo',
@@ -159,7 +160,15 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                         ]
                     })
                 }
-            }, {
+            },
+             {
+                text : "结算号",
+                dataIndex : "ftd_paycode",
+                width : 110,
+                editor:{
+                    xtype: ''
+                }
+            },{
                 text : "备注", 
                 dataIndex : "ftd_remark",
                 width : 120.0, 
@@ -175,30 +184,48 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         fieldLabel : "备注", 
         allowBlank : true, 
         columnWidth : 0.75
-    }, {
-        xtype : "textfield", 
+    },{
+        xtype : "hidden", 
         name : "creatorId", 
         fieldLabel : "录入人ID", 
-        hidden:true
-    }, {
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
         name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "createTime",
+        name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
         readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     },{
         xtype: 'textfield',
         name: 'ft_auditman',
         fieldLabel: '审核人',
-        hidden: true
+        readOnly: true
     },{
         xtype: "datefield",
         name: "ft_auditdate",
         fieldLabel: "审核日期",
-        hidden: true
+        readOnly: true
     }]
 });

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

@@ -4,8 +4,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'bandinfoDbfindTrigger[name=ftd_bankname]':{
+            'dbfindtrigger[name=ftd_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[
@@ -15,11 +14,14 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             from:'bk_bankname',to:'ftd_bankname'
                         },{
                             from:'id',to:'ftd_bankid',ignore:true
+                        },{
+                            from:'bk_thisamount',to:'bk_outthisamount'
                         }],
                     }) ;
                 }
             },
-            'bandinfoDbfindTrigger[name=ftd_inbankname]':{
+            //入
+            'dbfindtrigger[name=ftd_inbankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[
@@ -28,7 +30,9 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             from:'bk_bankname',to:'ftd_inbankname'
                         },{
-                            from:'id',to:'ftd_inbankid'
+                            from:'id',to:'ftd_inbankid',ignore:true
+                        },{
+                            from:'bk_inthisamount',to:'bk_inthisamount'
                         }],
                     }) ;   
 

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

@@ -25,14 +25,22 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         fieldLabel : "单据日期",
         columnWidth: 0.5
     },{
-        xtype: 'multicombo',
+        xtype: 'combobox',
         name: 'ft_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'ft_status',
+        valueField: 'ft_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['ft_statuscode', 'ft_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';
@@ -67,6 +75,10 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         xtype : "bandinfoDbfindTrigger",
         name : "ftd_inbankname",
         fieldLabel : "转入账号",
+    },{
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
                             },{
                                 from:'bk_bankname',to:'ftd_bankname'
                             },{
-                                from:'id',to:'ftd_bankid'
+                                from:'id',to:'ftd_bankid',ignore:true
                             }],
                     }) ;
                 }
@@ -28,7 +28,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
                             },{
                                 from:'bk_bankname',to:'ftd_inbankname'
                             },{
-                                from:'id',to:'ftd_inbankid'
+                                from:'id',to:'ftd_inbankid',ignore:true
                             }],
                     }) ;
 

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

@@ -150,25 +150,48 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         fieldLabel : "备注", 
         allowBlank : true, 
         columnWidth : 0.75
-    }, {
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
-        name : "or_recorder", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "or_recorddate",
+        name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     },{
         xtype: 'textfield',
         name: 'or_auditman',
         fieldLabel: '审核人',
-        hidden: true
+        readOnly:true
     },{
         xtype: "datefield",
         name: "or_auditdate",
         fieldLabel: "审核日期",
-        hidden: true
+        readOnly:true
     }]
 });

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

@@ -10,8 +10,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                     Ext.apply(f, {
                         dbfinds: [{
                             from: 'id',
-                            to: 'or_custid',
-                            ignore:true
+                            to: 'or_custid',ignore:true
                         }, {
                             from: 'cu_code',
                             to: 'or_custcode'
@@ -35,7 +34,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             to: 'or_bankname'
                         }, {
                             from: 'id',
-                            to: 'or_bankid'
+                            to: 'or_bankid',ignore:true
                         }],
                     });
 

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

@@ -40,22 +40,30 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
     },  {
         xtype: 'bandinfoDbfindTrigger',
         name: 'or_bankname',
-        fieldLabel: '账户名称'
+        fieldLabel: '结算账户'
     }, {
         xtype: 'condatefield',
         name: 'or_date',
         fieldLabel: '单据日期',
         columnWidth: 0.5,
         operation: 'between'
-    }, {
-        xtype: 'multicombo',
+    },{
+        xtype: 'combobox',
         name: 'or_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'or_status',
+        valueField: 'or_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['or_statuscode', 'or_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';
@@ -68,6 +76,10 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         fieldLabel: '收入类别',
         xtype : "remotecombo",
         storeUrl:'/api/document/fundinouttype/getCombo?condition=收入',
+    },{
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
@@ -77,7 +89,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         addXtype: 'money-othreceipts-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/money/othreceipts/',
-        // baseVastUrl: 'http://192.168.253.35:8880/othreceipts/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
@@ -101,7 +112,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             dataIndex: 'or_custname',
             width: 120
         },  {
-            text: '结算账号',
+            text: '结算账户',
             dataIndex: 'or_bankname',
             width: 120
         },{

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'id',to:'or_custid'
+                            from:'id',to:'or_custid',ignore:true
                         },{
                             from:'cu_code',to:'or_custcode'
                         },{
@@ -28,7 +28,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         },{
                             from:'bk_bankname',to:'or_bankname'
                         },{
-                            from:'id',to:'or_bankid'
+                            from:'id',to:'or_bankid',ignore:true
                         }],
                     });
 

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

@@ -150,25 +150,48 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         fieldLabel : "备注", 
         allowBlank : true, 
         columnWidth : 0.75
-    }, {
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
-        name : "os_recorder", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "os_recorddate",
+        name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     },{
         xtype: 'textfield',
         name: 'os_auditman',
         fieldLabel: '审核人',
-        hidden: true
+        readOnly:true
     },{
         xtype: "datefield",
         name: "os_auditdate",
         fieldLabel: "审核日期",
-        hidden: true
+        readOnly:true
     }]
 });

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

@@ -35,7 +35,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             to: 'os_bankname'
                         }, {
                             from: 'id',
-                            to: 'os_bankid'
+                            to: 'os_bankid',ignore:true
                         }],
                     });
 

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

@@ -47,14 +47,22 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         columnWidth: 0.5,
         fieldLabel: '单据日期'
     },{
-        xtype: 'multicombo',
+        xtype: 'combobox',
         name: 'os_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'os_status',
+        valueField: 'os_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['os_statuscode', 'os_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';
@@ -67,6 +75,10 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         fieldLabel: '支出类别',
         xtype : "remotecombo",
         storeUrl:'/api/document/fundinouttype/getCombo?condition=支出',
+    },{
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -31,7 +31,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                         },{
                             from:'bk_bankname',to:'os_bankname'
                         },{
-                            from:'id',to:'os_bankid'
+                            from:'id',to:'os_bankid',ignore:true
                         }],
                     }); 
 

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

@@ -20,13 +20,6 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _auditUrl: '/api/money/paybalance/audit/',
     _unAuditUrl: '/api/money/paybalance/unAudit/',
     _deleteUrl: '/api/money/paybalance/delete/',
-
-    // _readUrl: 'http://192.168.253.35:8880/paybalance/read/',
-    // _saveUrl: 'http://192.168.253.129:8940/money/paybalance/save/',
-    // _auditUrl: 'http://192.168.253.35:8880/paybalance/audit/',
-    // _unAuditUrl: 'http://192.168.253.35:8880/paybalance/unAudit/',
-    // _deleteUrl: 'http://192.168.253.129:8940/money/paybalance/delete/',
-    
     initId: 0,
 
     toolBtns: [],
@@ -97,7 +90,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         storeModel: 'saas.model.money.PayBalance1',
         detnoColumn: 'pd_detno',
         deleteDetailUrl: '/api/money/paybalance/deleteDetail1/',
-        columns: [{
+        columns: [
+        {
             text: 'ID',
             dataIndex: 'id',
             hidden: true
@@ -188,7 +182,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         detnoColumn: 'pbd_detno',
         allowEmpty: true,
         deleteDetailUrl: '/api/money/paybalance/deleteDetail2/',
-        columns: [{
+        columns: [
+        {
             text: 'ID',
             dataIndex: 'id',
             hidden: true
@@ -327,33 +322,48 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         columnWidth: 1,
         fieldLabel: '备注'
     }, {
-        xtype: 'hidden',
-        name: 'pb_recorderid',
-        fieldLabel: '创建人ID'
-    }, {
-        xtype: 'hidden',
-        name: 'pb_recorder',
-        fieldLabel: '录入人'
-    }, {
-        xtype: "hidden",
-        name: "pb_recorddate",
-        fieldLabel: "录入日期"
-    }, {
-        xtype: "hidden",
-        name: "updatedate",
-        fieldLabel: "更新日期"
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
+        xtype : "textfield", 
+        name : "creatorName", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
-        xtype: "hidden",
-        readOnly: true,
-        editable: false,
-        name: "pb_status",
-        fieldLabel: "单据状态"
+        xtype : "datefield", 
+        name : "createTime", 
+        fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
     }, {
-        xtype: "hidden",
-        readOnly: true,
-        editable: false,
-        name: "pb_statuscode",
-        fieldLabel: "单据状态码"
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype: 'textfield',
+        name: 'pb_auditman',
+        fieldLabel: '审核人',
+        readOnly: true
+    },{
+        xtype: "datefield",
+        name: "pb_auditdate",
+        fieldLabel: "审核日期",
+        readOnly: true
     }, {
         xtype: 'hidden',
         name: 'pb_text1',
@@ -374,16 +384,6 @@ 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/payBalance/FormPanelController.js

@@ -127,7 +127,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                     Ext.apply(f, {
                         dbfinds: [{
                             from: 'id',
-                            to: 'pd_bankid'
+                            to: 'pd_bankid',ignore:true
                         }, {
                             from: 'bk_bankcode',
                             to: 'pd_bankcode'

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

@@ -34,7 +34,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                     Ext.apply(f, {
                         dbfinds: [{
                             from: 'id',
-                            to: 'pd_bankid'
+                            to: 'pd_bankid',ignore:true
                         }, {
                             from: 'bk_bankcode',
                             to: 'pd_bankcode'

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

@@ -21,13 +21,6 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
     _auditUrl: '/api/money/recbalance/audit/',
     _unAuditUrl: '/api/money/recbalance/unAudit/',
     _deleteUrl: '/api/money/recbalance/delete/',
-
-    // _saveUrl: 'http://192.168.253.35:8880/recbalance/save/',
-    // _readUrl: 'http://192.168.253.35:8880/recbalance/read/',
-    // _auditUrl: 'http://192.168.253.35:8880/recbalance/audit/',
-    // _unAuditUrl: 'http://192.168.253.35:8880/recbalance/unAudit/',
-
-
     initId: 0,
 
     defaultItems: [{
@@ -318,41 +311,49 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         name: 'rb_remark',
         fieldLabel: '备注',
         columnWidth: 1
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
+        xtype : "textfield", 
+        name : "creatorName", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
-        xtype: 'numberfield',
-        name: 'rb_recorderid',
-        fieldLabel: '录入人ID',
-        hidden: true
-    }, {
-        xtype: 'textfield',
-        name: 'rb_recorder',
-        fieldLabel: '录入人',
-        hidden: true
-    }, {
-        xtype: 'numberfield',
-        name: 'updaterId',
-        fieldLabel: '更新人ID',
-        hidden: true
-    }, {
-        xtype: 'datefield',
-        name: 'updatedate',
-        fieldLabel: '更新日期',
-        hidden: true
+        xtype : "datefield", 
+        name : "createTime", 
+        fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
     }, {
-        xtype: "datefield",
-        name: "rb_recorddate",
-        fieldLabel: "录入日期",
-        hidden: true
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype: 'textfield',
         name: 'rb_auditman',
         fieldLabel: '审核人',
-        hidden: true
+        readOnly: true
     },{
         xtype: "datefield",
         name: "rb_auditdate",
         fieldLabel: "审核日期",
-        hidden: true
+        readOnly: true
     }],
 
     beforeAudit: function() {

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

@@ -58,7 +58,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
-            },
+            }
         }, {
             text: '往来单位',
             dataIndex: 'bcode'

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

@@ -85,11 +85,17 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             xtype: 'numbercolumn',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
         }, {
@@ -101,15 +107,21 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             xtype: 'numbercolumn',
             dataIndex: 'pd_nettotal',
             xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
         }, {
             text: '备注',
-            dataIndex: 'pd_text1'
+            dataIndex: 'pd_remark'
         }]
 });

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

@@ -57,34 +57,55 @@ Ext.define('saas.view.money.report.PayDetail', {
             dataIndex: 've_beginapamount',
             xtype: 'numbercolumn',
             width: 140,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: '本期付款金额',
             xtype: 'numbercolumn',
             dataIndex: 'pb_pdamount',
             xtype: 'numbercolumn',
-            summaryType: 'sum',
             width: 140,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
+            summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: '应付余额',
             xtype: 'numbercolumn',
             dataIndex: 'mustpay',
             xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: '应付日期',
@@ -95,11 +116,18 @@ Ext.define('saas.view.money.report.PayDetail', {
             xtype: 'numbercolumn',
             dataIndex: 'pi_total',
             xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: '备注',

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

@@ -62,37 +62,59 @@ Ext.define('saas.view.money.report.RecDetail', {
             text:'期初应收',
             dataIndex:'cu_beginaramount',
             xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         },{
             text:'本期收款金额',
             xtype: 'numbercolumn',
             dataIndex:'pb_pdamount',
             xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         },{
             text: '应收余额',
             xtype: 'numbercolumn',
             dataIndex: 'mustpay',
             xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: '应收日期',
-            dataIndex: 'mustdate'
+            dataIndex: 'mustdate',
+            xtype:'datecolumn'
         }, {
             text: '单据总金额',
             dataIndex: 'pi_total',

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

@@ -66,17 +66,24 @@ Ext.define('saas.view.money.report.VendorCheck', {
             dataIndex: 'pr_spec'
         }, {
             text: '单位',
-            dataIndex: 'pd_unit'
+            dataIndex: 'pr_unit'
         }, {
             text: '采购数量',
             xtype: 'numbercolumn',
             dataIndex: 'qty',
             xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+	            var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+	            var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: '单价',
@@ -91,11 +98,18 @@ Ext.define('saas.view.money.report.VendorCheck', {
             xtype: 'numbercolumn',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: '不含税单价',

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

@@ -56,12 +56,13 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         name : "pu_delivery", 
         fieldLabel : "交货日期",
         allowBlank:false,
+        defaultValue: new Date(),
         columnWidth : 0.25,
     },{
+        name : "pu_shipaddresscode", 
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/address/getCombo',
-        name : "pu_shipaddresscode", 
         fieldLabel : "交货地址", 
         allowBlank : false, 
         columnWidth : 0.5,
@@ -189,7 +190,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 8 ? 8 :(arr[1].length < 2? 2 : arr[1].length))).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 },
@@ -350,7 +351,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "createtime", 
+        name : "createTime", 
         fieldLabel : "录入日期",
         readOnly:true, 
         defaultValue: new Date()
@@ -366,7 +367,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         readOnly:true
     }, {
         xtype : "hidden", 
-        name : "updatetime", 
+        name : "updateTime", 
         fieldLabel : "更新日期",
         readOnly:true, 
         defaultValue: new Date()

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

@@ -355,7 +355,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "createtime", 
+        name : "createTime", 
         fieldLabel : "录入日期",
         readOnly:true, 
         defaultValue: new Date()
@@ -371,7 +371,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         readOnly:true
     }, {
         xtype : "hidden", 
-        name : "updatetime", 
+        name : "updateTime", 
         fieldLabel : "更新日期",
         readOnly:true, 
         defaultValue: new Date()

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

@@ -340,7 +340,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "createtime", 
+        name : "createTime", 
         fieldLabel : "录入日期",
         readOnly:true, 
         defaultValue: new Date()
@@ -356,7 +356,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         readOnly:true
     }, {
         xtype : "hidden", 
-        name : "updatetime", 
+        name : "updateTime", 
         fieldLabel : "更新日期",
         readOnly:true, 
         defaultValue: new Date()

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

@@ -140,14 +140,14 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         dataIndex: 'pd_profitpresent',
         xtype: 'numbercolumn',
         renderer : function(v) {
-            var arr = (v*100 + '.').split('.');
+            var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0.' + xr.join();
-            return Ext.util.Format.number(v*100, format);
+            return Ext.util.Format.number(v, format);
         }
     }, {
         text : "备注", 
-        dataIndex : "pd_text1",
+        dataIndex : "pd_remark",
         width : 250 
     }]
 

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

@@ -104,7 +104,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
         dataIndex: 'rb_backrate',
         xtype: 'numbercolumn',
         renderer : function(v) {
-            var arr = (v*100 + '.').split('.');
+            var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0.' + xr.join();
             return Ext.util.Format.number(v*100, format);

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

@@ -53,14 +53,14 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         fieldLabel : "客户名称",
         allowBlank : false
     }, {
-        name : "sa_toplace", 
+        name : "pu_shipaddresscode", 
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/address/getCombo',
         fieldLabel : "交货地址", 
         allowBlank : false, 
         columnWidth : 0.5,
-        hiddenBtn:true,//true 则会关闭新增按钮功能
+        hiddenBtn:false,//true 则会关闭新增按钮功能
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});
             var form = this.ownerCmp.ownerCt;
@@ -199,14 +199,10 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 8 ? 8 :(arr[1].length < 2? 2 : arr[1].length))).fill('0');
                     var format = '0,000.' + xr.join();
-                    if(!v){
-                        return Ext.util.Format.number(v, '0.00');
-                    }else{
-                        return Ext.util.Format.number(v, format);
-                    }
-                }
+                    return Ext.util.Format.number(v, format);
+               }
             }, 
             {
                 text : "税率", 
@@ -314,17 +310,39 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         fieldLabel : '出货状态', 
         hidden : true,
         readOnly:true
-     }, {
+     },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
         name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "sa_recorddate", 
+        name : "createTime", 
         fieldLabel : "录入日期",
         readOnly:true, 
         defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "sa_auditman", 

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

@@ -261,7 +261,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }
             },{
                 text : "备注", 
-                dataIndex : "pd_text1",
+                dataIndex : "pd_remark",
                 width : 250, 
                 items : null,
                 editor : {
@@ -279,16 +279,38 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         name : "pi_remark", 
         fieldLabel : "备注", 
         columnWidth : 0.75
-    }, {
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
-        name : "pi_recordman", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "pi_recorddate", 
+        name : "createTime", 
         fieldLabel : "录入日期",
-        readOnly:true,
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
         defaultValue: new Date()
     }, {
         xtype : "textfield", 

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

@@ -188,7 +188,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             align:'right'
         }, {
             text: '备注',
-            dataIndex: 'pd_text1',
+            dataIndex: 'pd_remark',
             width: 250
         }]
     }

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

@@ -229,6 +229,9 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     decimalPrecision: 0,
                     minValue: 0,
                     maxValue: 100
+                }, 
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
                 }
             },
             {
@@ -264,7 +267,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             },{
                 text : "备注", 
-                dataIndex : "pd_text1",
+                dataIndex : "pd_remark",
                 width : 250, 
                 items : null,
                 editor : {
@@ -282,16 +285,38 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         name : "pi_remark", 
         fieldLabel : "备注", 
         columnWidth : 0.75
-    }, {
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
-        name : "pi_recordman", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "pi_recorddate", 
+        name : "createTime", 
         fieldLabel : "录入日期",
-        readOnly:true,
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
         defaultValue: new Date()
     }, {
         xtype : "textfield", 

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

@@ -186,7 +186,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             width: 120
         }, {
             text: '备注',
-            dataIndex: 'pd_text1',
+            dataIndex: 'pd_remark',
             width: 250
         }]
     }

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

@@ -223,7 +223,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                 }
             },{
                 text : "备注", 
-                dataIndex : "pd_text1",
+                dataIndex : "pd_remark",
                 width : 250, 
                 items : null,
                 editor : {
@@ -236,7 +236,13 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         name : "pi_remark", 
         fieldLabel : "备注", 
         columnWidth : 1
-    }, {
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
         name : "creatorName", 
         fieldLabel : "录入人", 
@@ -245,7 +251,24 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

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

@@ -341,15 +341,38 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 },
             }]
     },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
-        name : "ma_recorder", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "ma_auditman", 

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

@@ -22,14 +22,6 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     _auditUrl:'/api/storage/prodinout/audit',
     _unAuditUrl: '/api/storage/prodinout/unAudit/',
     _deleteUrl:'/api/storage/prodinout/delete/',
-
-    // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:9000/prodinout/read/',
-    // _saveUrl:'http://localhost:9000/prodinout/save',
-    // _auditUrl:'http://localhost:9000/prodinout/audit',
-    // _unAuditUrl:'http://localhost:9000/prodinout/unAudit',
-    // _deleteUrl:'http://localhost:9000/prodinout/delete/',
-
     initId:0,
 
     toolBtns: [],
@@ -301,6 +293,12 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             }
         ]
     },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
         name : "creatorName", 
         fieldLabel : "录入人", 
@@ -309,7 +307,24 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

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

@@ -21,13 +21,6 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     _auditUrl: '/api/storage/prodinout/audit',
     _unAuditUrl: '/api/storage/prodinout/unAudit/',
     _deleteUrl: '/api/storage/prodinout/delete/',
-
-    // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:9000/prodinout/read/',
-    // _saveUrl:'http://localhost:9000/prodinout/save',
-    // _auditUrl:'http://localhost:9000/prodinout/audit',
-    // _deleteUrl:'http://localhost:9000/prodinout/delete/',
-
     initId: 0,
 
     toolBtns: [],
@@ -283,6 +276,12 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             }
         ]
     },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
         name : "creatorName", 
         fieldLabel : "录入人", 
@@ -291,7 +290,24 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

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

@@ -129,7 +129,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         width: 200
     },{
         text: '备注',
-        dataIndex: 'pd_text1',
+        dataIndex: 'pd_remark',
         width: 250
     }]
 

frontend/saas-web/app/view/sys/account/DataList.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.sys.account.DataList', {
     autoScroll: true,
     frame:true,
     layout:'fit',
-    dataUrl:'http://192.168.253.31:8560/api/account/account/accountRole/list',                 
+    dataUrl:'/api/account/account/accountRole/list',                 
 
     tbar: [{
         width: 150,

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

@@ -7,8 +7,8 @@ Ext.define('saas.view.sys.config.FormPanel', {
     
     //字段属性
     _idField: 'id',
-    _readUrl:'http://192.168.253.31:8560/api/account/company/read/current',
-    _saveUrl:'http://192.168.253.31:8560/api/account/company/save',
+    _readUrl:'/api/account/company/read/current',
+    _saveUrl:'/api/account/company/save',
 
     //基础属性
     frame:true,
@@ -140,15 +140,12 @@ Ext.define('saas.view.sys.config.FormPanel', {
             xtype:'textfield'
         },{
             allowBlank : true, 
-            width:500,
+            width:150,
+            buttonOnly:true,
             fieldLabel:'打印章上传',
             xtype: 'filefield',
             name:'signetFilefield',
-            emptyText: '请选择图片',
-            buttonText: '',
-            buttonConfig: {
-                iconCls: 'x-fa fa-picture-o',
-            },
+            buttonText: '选择图片',
             createFileInput : function() {
                     var me = this;
                     me.fileInputEl = me.button.el.createChild({
@@ -173,7 +170,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     fd.append('file', fileEl.files[0]);
                     form.setLoading(true);
                     Ext.Ajax.request({
-                        url: 'http://192.168.253.31:8560/api/file/upload',//这里是填写需要跨域访问的URL
+                        url: '/api/file/upload',//这里是填写需要跨域访问的URL
                         cors: true,
                         useDefaultXhrHeader: false,
                         method: 'post',
@@ -195,8 +192,9 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                 field.setRawValue(name);
                                 //读取图片
                                 if(data.id){
+                                    var serverOptions = Ext.manifest.server;
                                     var img = myForm.down('[name=SignetPhoto]');
-                                    img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+data.fullPath;
+                                    img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+data.fullPath;
                                     var showSignetPhoto = form.down('[name=showSignetPhoto]');
                                     showSignetPhoto.show();
                                 }
@@ -212,11 +210,15 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     });
                 }
             }
+        },{
+            xtype:'displayfield',
+            margin:'0 0 0 150',
+            value:'支持 JPG、JPEG、PNG、BMP 格式 , 图片小于10M ',  
         },{
             xtype: 'image',
             width: 100,
             height: 100,
-            margin:'5 0 5 150',
+            margin:'0 0 5 150',
             src:'resources/images/default/basePhoto.png',
             name:'SignetPhoto',
         },{
@@ -264,15 +266,12 @@ Ext.define('saas.view.sys.config.FormPanel', {
             xtype:'textfield'
         },{
             allowBlank : true, 
-            width:500,
+            width:150,
+            buttonOnly:true,
             fieldLabel:'Logo上传',
             name:'logoFilefield',
             xtype: 'filefield',
-            emptyText: '请选择图片',
-            buttonText: '',
-            buttonConfig: {
-                iconCls: 'x-fa fa-picture-o',
-            },
+            buttonText: '选择图片',
             createFileInput : function() {
                     var me = this;
                     me.fileInputEl = me.button.el.createChild({
@@ -297,7 +296,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     fd.append('file', fileEl.files[0]);
                     form.setLoading(true);
                     Ext.Ajax.request({
-                        url: 'http://192.168.253.31:8560/api/file/upload',//这里是填写需要跨域访问的URL
+                        url: '/api/file/upload',//这里是填写需要跨域访问的URL
                         cors: true,
                         useDefaultXhrHeader: false,
                         method: 'post',
@@ -316,11 +315,11 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                 var data = res.data;
                                 var name = data.name + "  (" + Ext.util.Format.fileSize(data.size) + ")";
                                 myForm.down('[name=logoUrl]').setValue(data.fullPath);
-                                field.setRawValue(name);
                                 //读取图片
                                 if(data.id){
+                                    var serverOptions = Ext.manifest.server;
                                     var img = myForm.down('[name=LogoPhoto]');
-                                    img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+data.fullPath;
+                                    img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+data.fullPath;
                                     var showLogoPhoto = form.down('[name=showLogoPhoto]');
                                     showLogoPhoto.show();
                                 }
@@ -336,12 +335,16 @@ Ext.define('saas.view.sys.config.FormPanel', {
                     });
                 }
             }
+        },{
+            xtype:'displayfield',
+            margin:'0 0 0 150',
+            value:'支持 JPG、JPEG、PNG、BMP 格式 , 图片小于10M ',  
         },{
             xtype: 'image',
             style:'border:1px solid #f7f7f7;',
             width: 100,
             height: 100,
-            margin:'5 0 5 150',
+            margin:'0 0 5 150',
             src:'resources/images/default/basePhoto.png',
             name:'LogoPhoto',
         },{
@@ -400,14 +403,12 @@ Ext.define('saas.view.sys.config.FormPanel', {
     },
 
     load:function(form){
+        var serverOptions = Ext.manifest.server;
         //打印章
         var signet = form.down('[name=signet]').value;
         if(signet&&signet!=''){
             var img = form.down('[name=SignetPhoto]');
-            img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+signet;
-            // var name = data.name + "  (" + Ext.util.Format.fileSize(data.size) + ")";
-            // myForm.down('[name=signet]').setValue(data.fullPath);
-            // field.setRawValue(name);
+            img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+signet;
             var showSignetPhoto = form.down('[name=showSignetPhoto]');
             showSignetPhoto.show();
         }
@@ -415,20 +416,18 @@ Ext.define('saas.view.sys.config.FormPanel', {
         var logoUrl = form.down('[name=logoUrl]').value;
         if(logoUrl&&logoUrl!=''){
             var img = form.down('[name=LogoPhoto]');
-            img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+logoUrl;
+            img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+logoUrl;
             var showLogoPhoto = form.down('[name=showLogoPhoto]');
             showLogoPhoto.show();
         }
         //文件名称
-        var viewModel = form.getViewModel();
-        if(viewModel.data.fileInfoList&&viewModel.data.fileInfoList.length!=0){
-            var logo = viewModel.data.fileInfoList[0].logo;
-            var logoName = logo.name + "  (" + Ext.util.Format.fileSize(logo.size) + ")";
-            form.down('[name=logoFilefield]').setRawValue(logoName);
-            var signet = viewModel.data.fileInfoList[0].signet;
-            var signetName = signet.name + "  (" + Ext.util.Format.fileSize(signet.size) + ")";
-            form.down('[name=signetFilefield]').setRawValue(signetName);
-        }
+        // var viewModel = form.getViewModel();
+        // if(viewModel.data.fileInfoList&&viewModel.data.fileInfoList.length!=0){
+        //     var logo = viewModel.data.fileInfoList[0].logo;
+        //     var logoName = logo.name + "  (" + Ext.util.Format.fileSize(logo.size) + ")";
+        //     var signet = viewModel.data.fileInfoList[0].signet;
+        //     var signetName = signet.name + "  (" + Ext.util.Format.fileSize(signet.size) + ")";
+        // }
     },
 
     lookPic:function(img){
@@ -466,10 +465,9 @@ Ext.define('saas.view.sys.config.FormPanel', {
     },
 
     downLoad:function(path){
+        var serverOptions = Ext.manifest.server;
+        window.location.href = serverOptions.basePath + '/api/file/download?path='+path;
         //ajax 响应下载必须要创建一个form实例
-
-        window.location.href = 'http://192.168.253.31:8560/api/file/download?path='+path;
-
         // if (!Ext.fly('ext-attach-download')) {  
 		// 	var frm = document.createElement('form');  
 		// 	frm.id = 'ext-attach-download';  

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

@@ -8,34 +8,46 @@ Ext.define('saas.view.sys.feedback.FormPanel', {
     viewName: 'sys-feedback-formpanel',
     caller:'feedBack',
     
-    defaultType: 'textfield',
-        fieldDefaults: {
-            labelWidth: 60
-        },
+    layout: 'column',
+    autoScroll: true,
 
-        layout: {
-            type: 'vbox',
-            align: 'stretch'
-        },
-
-        bodyPadding: 10,
-        border: false,
+    fieldDefaults: {
+        margin: '0 0 10 0',
+        labelAlign: 'right',
+        labelWidth: 90,
+        columnWidth: 0.25,
+    },
+    bodyPadding: 10,
+    border: false,
 
     items: [{
         xtype: 'hidden',
         name: 'id',
-        fieldLabel: 'id'
+        fieldLabel: 'id',
+        readOnly:true,
+        defaultVale:saas.util.BaseUtil.getCurrentUser() ? saas.util.BaseUtil.getCurrentUser().id:null
     }, {
         xtype : "textfield", 
         name : "fb_name", 
-        fieldLabel : "姓名"
+        fieldLabel : "姓名",
+        readOnly:true,
+        defaultVale:saas.util.BaseUtil.getCurrentUser() ? saas.util.BaseUtil.getCurrentUser().realname:null
     }, {
         xtype : "textfield", 
         name : "fb_mobile", 
-        fieldLabel : "联系方式"
+        fieldLabel : "手机号",
+        defaultVale:saas.util.BaseUtil.getCurrentUser() ? saas.util.BaseUtil.getCurrentUser().mobile:null
+    }, {
+        xtype : "textfield", 
+        name : "fb_QQ", 
+        fieldLabel : "QQ"
+    }, {
+        xtype : "textfield", 
+        name : "fb_wechat", 
+        fieldLabel : "微信"
     }, {
-        xtype : "textarea", 
-        name : "fb_email", 
+        xtype : "html", 
+        name : "fb_msg", 
         fieldLabel : "反馈内容",
         flex: 1
     }],buttons: [{

frontend/saas-web/app/view/sys/manager/FormPanel.scss

@@ -51,7 +51,17 @@
     .x-panel-body-default-framed{
         padding:0 !important;
     }
+    .x-grid-item-focused{
+        outline: none !important;
+        border:none !important;
+    }
     .x-keyboard-mode .x-grid-item-focused .x-grid-cell-inner:before{
-        border:1px solid #ffffff;
+        border:0px solid #ffffff !important;
+    }
+    .x-keyboard-mode .x-grid-item-focused{
+        border:0px solid #ffffff !important;
+    }
+    .x-grid-cell-inner .x-grid-cell-inner-action-col::before{
+        border:0px solid #ffffff !important;
     }
 }

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.sys.power.FormPanel', {
     frame:true,
     layout: 'border',
     autoScroll: true,
-    saveUrl:'http://192.168.253.31:8560/api/account/role/save/bind/resource',
+    saveUrl:'/api/account/role/save/bind/resource',
 
     items: [{
         region:'west',

frontend/saas-web/app/view/sys/power/GroupGrid.js

@@ -24,7 +24,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         groupHeaderTpl: '{name}'+'模块'
 	})],
     initId:0,
-    dataUrl:'http://192.168.253.31:8560/api/account/role/power/resource',
+    dataUrl:'/api/account/role/power/resource',
     selModel: {
         showHeaderCheckbox:false,
         checkOnly:true,

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

@@ -140,11 +140,6 @@
             "text": "收款单",
             "addType": "money-recbalance-formpanel",
             "viewType": "money-recbalance-querypanel"
-        }, {
-            "id": "verification",
-            "text": "核销单",
-            "addType": "money-verification-formpanel",
-            "viewType": "money-verification-querypanel"
         }, {
             "id": "othReceipts",
             "text": "其它收入单",