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

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-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/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

@@ -488,8 +488,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
         //采购验收单相关计算
         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);
     }
 

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},

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>

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&&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/dbfind/types/BankInfoDbfindTrigger.js

@@ -0,0 +1,62 @@
+Ext.define('saas.view.core.dbfind.types.BankInfoDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'bandinfoDbfindTrigger',
+
+    dataUrl: '/api/document/bankinformation/list',
+    addXtype: 'other-bankinformation',
+    addTitle: '资金账户',
+    dbtpls: [{
+        field: 'bk_bankcode',
+        width: 100
+    }, {
+        field: 'bk_bankname',
+        width: 100
+    }],
+    dbSearchFields: [{
+        emptyText: '查找资金账户',
+        xtype: "textfield",
+        name: "search",
+        getCondition: function (v) {
+            return "(upper(bk_bankcode) like '%" + v.toUpperCase() + "%' or upper(bk_bankname) like '%" + v.toUpperCase() + "%')";
+        },
+        allowBlank: true,
+        columnWidth: 0.25
+    }],
+    dbColumns: [{
+        text: "账户ID",
+        flex: 0,
+        dataIndex: "id",
+        width: 0,
+        xtype: ""
+    }, {
+        text: "资金账户",
+        flex: 1,
+        dataIndex: "bk_bankcode",
+        width: 120,
+        xtype: ""
+    }, {
+        text: "账户名称",
+        flex: 1,
+        dataIndex: "bk_bankname",
+        width: 150,
+        xtype: ""
+    }, {
+        text: "账户类别",
+        flex: 1,
+        dataIndex: "bk_type",
+        width: 120,
+        xtype: ""
+    }, {
+        text: "账户余额",
+        flex: 1,
+        dataIndex: "bk_thisamount",
+        width: 120,
+        xtype: 'numbercolumn',
+    }, {
+        text: "建帐日期",
+        flex: 1,
+        dataIndex: "bk_date",
+        width: 120,
+        xtype: "datecolumn"
+    }]
+});

frontend/saas-web/app/view/core/dbfind/types/BomDbfindTrigger.js

@@ -0,0 +1,58 @@
+/**
+ * 客户资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.BomDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'bomDbfindTrigger',
+
+    //数据接口
+    dataUrl: '/api/document/bom/list',
+    addXtype: 'document-bom-formpanel',
+    addTitle: 'BOM资料',
+    //联想设置
+    dbtpls: [{
+        field: 'bo_mothercode',
+        width: 100
+    }, {
+        field: 'bo_mothername',
+        width: 100
+    }],
+    
+    defaultCondition: "bo_statuscode='OPEN'",
+    //窗口字段设置
+    dbSearchFields: [{
+        emptyText: '输入BOM编号或名称',
+        xtype: "textfield",
+        name: "search",
+        width: 200,
+        getCondition: function (v) {
+            return "(upper(bo_mothercode) like '%" + v.toUpperCase() + "%' or upper(bo_mothername) like '%" + v.toUpperCase() + "%')";
+        },
+        allowBlank: true,
+        columnWidth: 0.25
+    }],
+    //窗口列设置
+    dbColumns: [{
+        text: "物料ID",
+        hidden: true,
+        dataIndex: "id",
+    }, {
+        text: "产品编号",
+        dataIndex: "bo_mothercode",
+        width: 200,
+    }, {
+        text: "产品名称",
+        width: 200,
+        dataIndex: "bo_mothername",
+    }, {
+        text: "产品规格",
+        width: 200,
+        dataIndex: "pr_spec",
+    }, {
+        text: "版本",
+        width: 200,
+        dataIndex: "bo_version",
+        flex: 1
+    }]
+
+});

frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js

@@ -0,0 +1,96 @@
+/**
+ * 客户资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'customerDbfindTrigger',
+
+    dataUrl: '/api/document/customer/dbfind',
+    addXtype: 'document-customer-formpanel',
+    addTitle: '客户资料',
+    defaultCondition: "cu_statuscode='OPEN'",
+    
+    dbtpls: [{
+        field: 'cu_code',
+        width: 100
+    }, {
+        field: 'cu_name',
+        width: 100
+    }],
+    dbSearchFields: [{
+        emptyText: '输入客户编号或客户名称',
+        xtype: "textfield",
+        name: "search",
+        getCondition: function (v) {
+            return "(upper(cu_code) like '%" + v.toUpperCase() + "%' or upper(cu_name) like '%" + v.toUpperCase() + "%')";
+        },
+        allowBlank: true,
+        columnWidth: 0.25
+    }],
+    dbColumns: [{
+        conditionCode: 'id',
+        text: "客户ID",
+        flex: 0,
+        dataIndex: "id",
+        width: 0,
+        xtype: "",
+    }, {
+        conditionCode: 'cu_code',
+        text: "客户编号",
+        flex: 1,
+        dataIndex: "cu_code",
+        width: 100,
+        xtype: "",
+    }, {
+        conditionCode: 'cu_name',
+        text: "客户名称",
+        flex: 1,
+        dataIndex: "cu_name",
+        xtype: "",
+    }, {
+        conditionCode: 'cu_type',
+        text: "客户类型",
+        flex: 1,
+        dataIndex: "cu_type",
+        width: 200,
+        xtype: "",
+    }, {
+        text: "业务员编号",
+        flex: 1,
+        dataIndex: "cu_sellercode",
+        width: 100
+    }, {
+        text: "业务员",
+        flex: 1,
+        dataIndex: "cu_sellername",
+        width: 100
+    }, {
+        text: "税率",
+        flex: 1,
+        dataIndex: "cu_taxrate",
+        width: 100,
+        xtype: 'numbercolumn',
+    }, {
+        text: "承付天数",
+        flex: 1,
+        dataIndex: "cu_promisedays",
+        width: 100,
+        xtype: 'numbercolumn',
+        align: 'end',
+        renderer: function (v) {
+            return Ext.util.Format.number(v, '0');
+        }
+    }, {
+        text: "额度",
+        flex: 1,
+        dataIndex: "cu_credit",
+        width: 100,
+        xtype: 'numbercolumn',
+    }, {
+        text: "客户地址",
+        flex: 1,
+        dataIndex: "ca_address",
+        width: 250
+    }]
+
+});

frontend/saas-web/app/view/core/dbfind/types/EmployeeDbfindTrigger.js

@@ -0,0 +1,58 @@
+/**
+ * 人员资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.EmployeeDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'employeeDbfindTrigger',
+
+    //数据接口
+    dataUrl:'/api/document/employee/list',
+    addXtype: 'document-vendor-formpanel',
+    addTitle: '供应商资料',
+    //联想设置
+    dbtpls:[{
+        field:'em_code',width:100
+    },{
+        field:'em_name',width:100
+    }],
+    defaultCondition: "em_class='正式'",
+    dbSearchFields:[{
+        emptyText:'输入人员编号或名称',
+        xtype : "textfield", 
+        name : "search", 
+        getCondition: function(v) {
+            return "(upper(em_code) like '%"+v.toUpperCase()+"%' or upper(em_name) like '%"+v.toUpperCase()+"%')";
+        },
+        allowBlank : true, 
+        columnWidth : 0.25
+    }],
+    //放大镜窗口列表
+    dbColumns:[{
+        text: "人员ID",
+        hidden: true,
+        dataIndex: "id",
+        width: 0,
+        xtype: "numbercolumn"
+    },{
+        text: "人员编号",
+        dataIndex: "em_code",
+        width: 200
+    }, {
+        text: "人员名称",
+        dataIndex: "em_name",
+        width: 200
+    }, {
+        text: "类型",
+        dataIndex: "em_class",
+        width: 180,
+    }, {
+        text: "手机",
+        dataIndex: "em_mobile",
+        width: 180,
+    }, {
+        text: "邮箱",
+        dataIndex: "em_email",
+        width: 180,
+    }]
+
+});

frontend/saas-web/app/view/core/dbfind/types/ProductDbfindTrigger.js

@@ -0,0 +1,101 @@
+/**
+ * 物料资料放大镜（单选）
+ */
+Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'productDbfindTrigger',
+
+    dataUrl:'/api/document/product/list',
+    addXtype: 'document-product-formpanel',
+    addTitle: '物料资料',
+    dbtpls:[{
+        field:'pr_code',width:100
+    },{
+        field:'pr_detail',width:100
+    }],
+    defaultCondition: "pr_statuscode='OPEN'",
+    dbSearchFields:[{
+        emptyText:'输入物料编号、名称或规格',
+        xtype : "textfield", 
+        name : "search", 
+        width: 200,
+        getCondition: function(v) {
+            return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+        },
+        allowBlank : true, 
+        columnWidth : 0.25
+    }],
+    dbColumns:[{
+        text: "物料ID",
+        hidden: true,
+        dataIndex: "id",
+    }, {
+        text: "物料编号",       
+        dataIndex: "pr_code",
+        width: 200,
+    }, {
+        text: "物料名称",
+        width: 200,
+        dataIndex: "pr_detail",
+    }, {
+        text: "规格",
+        dataIndex: "pr_spec",
+        width: 100,
+    }, {
+        text: "单位",
+        dataIndex: "pr_spec",
+        width: 100,
+    },{
+        text: "仓库id",
+        dataIndex: "pr_whid",
+        hidden: true,
+    },{
+        text: "仓库编号",
+        dataIndex: "pr_whcode",
+        hidden: true,
+    },{
+        text: "仓库",
+        dataIndex: "pr_whname",
+        width: 200,
+        hidden: true
+    },{
+        text: "总库存数",
+        dataIndex: "po_onhand",
+        width: 100,
+        xtype: 'numbercolumn',
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        },                            
+        align:'end'
+    },{
+        text: "类型",
+        dataIndex: "pr_kind",
+        width: 100,
+    },{
+        text: "型号",
+        dataIndex: "pr_orispeccode",
+        width: 100,
+    },{
+        text: "品牌",
+        dataIndex: "pr_brand",
+        width: 100,
+    },{
+        text: "供应商",
+        dataIndex: "pr_vendname",
+        width: 100,
+    },{
+        text: "最小包装",
+        dataIndex: "pr_zxbzs",
+        width: 100,
+        xtype: 'numbercolumn',
+        align: 'end'
+    },{
+        text: "L/T",
+        dataIndex: "pr_leadtime",
+        width: 100,
+    }]
+
+});

frontend/saas-web/app/view/core/dbfind/types/ProductMultiDbfindTrigger.js

@@ -0,0 +1,143 @@
+/**
+ * 物料资料放大镜（多选）
+ */
+Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.MultiDbfindTrigger',
+    xtype: 'productMultiDbfindTrigger',
+
+    //数据接口
+    // dataUrl:'http://192.168.253.31:9480/product/getProductsByCondition',
+    // dataUrl:'http://localhost:9480/product/list',
+    dataUrl: '/api/document/product/list',
+    addXtype: 'document-product-formpanel',
+    addTitle: '物料资料',
+    //放大镜赋值设置
+    dbfinds: [{
+        from: 'id',
+        to: 'pd_prodid',
+        ignore: true
+    }, {
+        from: 'pr_code',
+        to: 'pd_prodcode'
+    }, {
+        from: 'pr_detail',
+        to: 'pr_detail'
+    }, {
+        from: 'pr_spec',
+        to: 'pr_spec'
+    }, {
+        from: 'pr_purcprice',
+        to: 'pd_price'
+    }, {
+        from: 'pr_zxbzs',
+        to: 'pr_zxbzs'
+    }],
+    //联想设置
+    dbtpls: [{
+        field: 'pr_code',
+        width: 100
+    }, {
+        field: 'pr_detail',
+        width: 100
+    }],
+    defaultCondition: "pr_statuscode='OPEN'",
+    dbSearchFields: [{
+        emptyText: '输入物料编号、名称或规格',
+        width: 200,
+        xtype: "textfield",
+        name: "search",
+        allowBlank: true,
+        columnWidth: 0.25,
+        getCondition: function (v) {
+            return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%" + v.toUpperCase() + "%' or upper(pr_spec) like '%" + v.toUpperCase() + "%')";
+        }
+    }],
+    //窗口列设置
+    dbColumns: [{
+        text: "物料ID",
+        hidden: true,
+        dataIndex: "id",
+    }, {
+        text: "物料编号",
+        dataIndex: "pr_code",
+        width: 200,
+    }, {
+        text: "物料名称",
+        width: 200,
+        dataIndex: "pr_detail",
+    }, {
+        text: "规格",
+        dataIndex: "pr_spec",
+        width: 100,
+    }, {
+        text: "单位",
+        dataIndex: "pr_unit",
+        width: 100,
+    }, {
+        text: "最新采购单价",
+        dataIndex: "pr_purcprice",
+        align: 'end',
+        xtype: 'numbercolumn',
+        width: 0,
+    }, {
+        text: "仓库id",
+        dataIndex: "pr_whid",
+        hidden: true,
+    }, {
+        text: "仓库编号",
+        dataIndex: "pr_whcode",
+        hidden: true,
+    }, {
+        text: "仓库",
+        dataIndex: "pr_whname",
+        width: 200,
+        hidden: true
+    }, {
+        text: "总库存数",
+        dataIndex: "po_onhand",
+        width: 100,
+        xtype: 'numbercolumn',
+        renderer: function (v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        },
+        align: 'end'
+    }, {
+        text: "类型",
+        dataIndex: "pr_kind",
+        width: 100,
+    }, {
+        text: "型号",
+        dataIndex: "pr_orispeccode",
+        width: 100,
+    }, {
+        text: "品牌",
+        dataIndex: "pr_brand",
+        width: 100,
+    }, {
+        text: "供应商",
+        dataIndex: "pr_vendname",
+        width: 100,
+    }, {
+        text: "最小包装",
+        dataIndex: "pr_zxbzs",
+        width: 100,
+        xtype: 'numbercolumn',
+        renderer : function(v) {
+            if(!v) {
+                return 0;
+            }
+            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);
+        },
+    }, {
+        text: "L/T",
+        dataIndex: "pr_leadtime",
+        width: 100,
+    }]
+
+});

frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js

@@ -0,0 +1,79 @@
+/**
+ * 供应商资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'vendorDbfindTrigger',
+
+    //数据接口
+    dataUrl:'/api/document/vendor/list',
+    addXtype: 'document-vendor-formpanel',
+    addTitle: '供应商资料',
+    defaultCondition:"ve_statuscode='OPEN'",
+
+    //联想设置
+    dbtpls:[{
+        field:'ve_code',width:100
+    },{
+        field:'ve_name',width:100
+    }],
+    defaultCondition: "ve_statuscode='OPEN'",
+    dbSearchFields:[{
+        emptyText:'输入供应商编号或名称',
+        xtype : "textfield", 
+        name : "search", 
+        getCondition: function(v) {
+            return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
+        },
+        allowBlank : true, 
+        columnWidth : 0.25
+    }],
+    //放大镜窗口列表
+    dbColumns:[{
+        text: "供应商ID",
+        hidden: true,
+        dataIndex: "id",
+        width: 100,
+        xtype: "numbercolumn"
+    },{
+        text: "供应商编号",
+        dataIndex: "ve_code",
+        width: 200
+    }, {
+        text: "供应商名称",
+        dataIndex: "ve_name",
+        width: 200
+    }, {
+        text: "供应商类型",
+        dataIndex: "ve_type",
+        width: 180,
+    }, {
+        text: "税率",
+        dataIndex: "ve_taxrate",
+        width: 100,
+        xtype: 'numbercolumn',
+        align:'end'
+    }, {
+        text: "承付天数",
+        dataIndex: "ve_promisedays",
+        width: 100,
+        xtype: 'numbercolumn',
+        align: 'end', 
+        renderer : function(v) {
+            return Ext.util.Format.number(v, '0');
+        }
+    }, {
+        text: "纳税人识别号",
+        dataIndex: "ve_bankaccount",
+        width: 150
+    }, {
+        text: "开户银行",
+        dataIndex: "ve_bankaccount",
+        width: 150
+    }, {
+        text: "银行账户",
+        dataIndex: "ve_bankcode",
+        flex:1
+    }]
+
+});

frontend/saas-web/app/view/core/dbfind/types/WarehouseDbfindTrigger.js

@@ -0,0 +1,54 @@
+/**
+ * 仓库资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'warehouseDbfindTrigger',
+
+    dataUrl: '/api/document/warehouse/list',
+    // dataUrl:'http://localhost:9480/warehouse/list',
+    addXtype: 'other-warehouse',
+    addTitle: '仓库资料',
+    defaultCondition: "wh_statuscode='OPEN'",
+    dbtpls: [{
+        field: 'wh_code',
+        width: 100
+    }, {
+        field: 'wh_description',
+        width: 100
+    }],
+    dbSearchFields: [{
+        emptyText: '输入仓库编号或名称',
+        xtype: "textfield",
+        name: "wh_code",
+        allowBlank: true,
+        columnWidth: 0.25,
+        getCondition: function (v) {
+            return "(upper(wh_code) like '%" + v.toUpperCase() + "%' or upper(wh_description) like '%" + v.toUpperCase() + "%')";
+        }
+    }],
+    dbColumns: [{
+        text: "仓库ID",
+        flex: 0,
+        dataIndex: "id",
+        width: 0,
+        xtype: "",
+    }, {
+        text: "仓库编号",
+        flex: 1,
+        dataIndex: "wh_code",
+        width: 100,
+        xtype: "",
+    }, {
+        text: "仓库名称",
+        flex: 1,
+        dataIndex: "wh_description",
+        xtype: "",
+    }, {
+        text: "仓库类型",
+        flex: 1,
+        dataIndex: "wh_type",
+        xtype: "",
+    }]
+
+});

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/query/QueryGridPanel.js

@@ -116,6 +116,10 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                     load: function(store, records, successful, operation, eOpts) {
                         var queryPanel = me.up('core-query-querypanel'),
                         mode = queryPanel.getQueryMode();
+
+                        store.each(function(d, i) {
+                            d.set('id', d.get('id') + '-' + i);
+                        });
                         
                         if(mode=="MAIN"){
                             me.reconfigure(store, me.initColumns(me.baseColumn));

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -226,6 +226,11 @@ Ext.define('saas.view.core.report.ReportPanel', {
                         condition: JSON.stringify(condition)
                     });
     
+                },
+                load: function(store, records, successful, operation, eOpts) {
+                    store.each(function(d, i) {
+                        d.set('id', d.get('id') + '-' + i);
+                    });
                 }
             }
         });

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/bom/FormController.js

@@ -6,12 +6,9 @@ Ext.define('saas.view.document.bom.FormController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=bo_mothercode]':{
+            'productDbfindTrigger[name=bo_mothercode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[
                         {
                             from:'pr_code',to:'bo_mothercode'
@@ -22,99 +19,14 @@ Ext.define('saas.view.document.bom.FormController', {
                         }, {
                             from:'id',to:'bo_motherid',ignore:true
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }
             },
             //从表多选放大镜赋值关系 以及 tpl模板
-            'multidbfindtrigger[name=bd_soncode]':{
+            'productMultiDbfindTrigger[name=bd_soncode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'bd_soncode'                          
@@ -127,105 +39,12 @@ Ext.define('saas.view.document.bom.FormController', {
                         },{
                             from:'id',to:'bd_sonid',ignore:true 
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            width: 200,
-                            xtype : "textfield", 
-                            name : "search", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%"+ v.toUpperCase() +"%' or upper(pr_spec) like '%"+ v.toUpperCase() +"%')";
-                            }
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        }, {
-                            "text": "最新采购单价",
-                            "dataIndex": "pr_purcprice",
-                            "width": 0,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库名称",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
                 }
             },
-            'multidbfindtrigger[name=bd_replace]':{
+            'productMultiDbfindTrigger[name=bd_replace]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         //放大镜赋值设置
                         dbfinds:[
                         {
@@ -237,93 +56,6 @@ Ext.define('saas.view.document.bom.FormController', {
                         },{
                             from:'pr_unit',to:'pr_unit'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            width: 200,
-                            xtype : "textfield", 
-                            name : "search", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%"+ v.toUpperCase() +"%' or upper(pr_spec) like '%"+ v.toUpperCase() +"%')";
-                            }
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        }, {
-                            "text": "最新采购单价",
-                            "dataIndex": "pr_purcprice",
-                            "width": 0,
-                            xtype: 'numbercolumn',
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            xtype: 'numbercolumn',
-                            "width": 100,
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
                 }
             }

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

@@ -55,7 +55,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
         name: 'bo_motherid',
         fieldLabel: '产品id'
     },{
-        xtype : "dbfindtrigger", 
+        xtype : "bomDbfindTrigger", 
         name: 'bo_mothercode',
         fieldLabel: '产品编号',
         allowBlank: false
@@ -114,7 +114,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             }, {
                 allowBlank:false,
@@ -178,7 +178,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             }, {
                 text : "备注", 

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/employee/FormController.js

@@ -1,142 +1,6 @@
 Ext.define('saas.view.document.employee.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
     alias: 'controller.document-employee-formpanel',
-    init: function (form) {
-        var me = this;
-        this.control({
-            //主表单选放大镜模板
-            'dbfindtrigger[name=pr_vendcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/vendor/getVendorsByCondition',
-                        //赋值 
-                        dbfinds:[{
-                            from:'id',to:'pr_vendid',ignore:true
-                        },{
-                            from:'ve_code',to:'pr_vendcode'
-                        },{
-                            from:'ve_name',to:'pr_vendname'
-                        }],
-                        //新增地址
-                        addXtype:'document-vendor-formpanel',
-                        //新增标题
-                        addTitle:'供应商资料', 
-                        //联想设置
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: 've_statuscode="OPEN"',
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            xtype : "textfield",
-                            name: 'name',
-                            getCondition: function(v) {
-                                return "((ve_code) like '%"+v.toUpperCase()+"%' or (ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            emptyText : "请输入供应商编号或名称", 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                        },{
-                            "text": "供应商编号",
-                            "flex": 1,
-                            "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                        }, {
-                            "text": "供应商名称",
-                            "flex": 1,
-                            "dataIndex": "ve_name",
-                            "xtype": "",
-                        }, {
-                            "text": "供应商类型",
-                            "flex": 0,
-                            "dataIndex": "ve_type",
-                            "width": 200,
-                            "xtype": "",
-                        }]
-                    }) ;   
-
-                }
-            },
-            // 仓库编号
-            'dbfindtrigger[name=pr_whcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/warehouse/list',
-                        //放大镜赋值设置
-                        dbfinds:[{
-                            from:'id',to:'pr_whid',ignore:true
-                        },{
-                            from:'wh_code',to:'pr_whcode'
-                        },{
-                            from:'wh_description',to:'pr_whname'
-                        }],
-                        //新增地址
-                        addXtype:'other-warehouse',
-                        //新增标题
-                        addTitle:'仓库资料', 
-                        //联想查询条件
-                        defaultCondition:"wh_statuscode='OPEN'",
-                        //联想设置
-                        dbtpls:[{
-                            field:'wh_code',width:180
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或仓库名称或仓库类型',
-                            xtype : "textfield", 
-                            name : "name", 
-                            allowBlank : true, 
-                            width:260,
-                            getCondition:function(v){
-                                return "((wh_code) like '%"+v.toUpperCase()+"%' or (wh_description) like '%"+v.toUpperCase()+"%'"+
-                                " or (wh_type) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                        },{
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                        },{
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                        }]
-                    }) ;   
-
-                }
-            }
-        });
-
-    },
 
     auditBtnClick: function() {
         var me = this,

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

@@ -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/product/FormController.js

@@ -5,76 +5,24 @@ Ext.define('saas.view.document.product.FormController', {
         var me = this;
         this.control({
             //主表单选放大镜模板
-            'dbfindtrigger[name=pr_vendcode]':{
+            'vendorDbfindTrigger[name=pr_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/vendor/getVendorsByCondition',
-                        //赋值 
                         dbfinds:[{
                             from:'id',to:'pr_vendid',ignore:true
                         },{
                             from:'ve_code',to:'pr_vendcode'
                         },{
                             from:'ve_name',to:'pr_vendname'
-                        }],
-                        //新增地址
-                        addXtype:'document-vendor-formpanel',
-                        //新增标题
-                        addTitle:'供应商资料', 
-                        //联想设置
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: 've_statuscode="OPEN"',
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            xtype : "textfield",
-                            name: 'name',
-                            getCondition: function(v) {
-                                return "((ve_code) like '%"+v.toUpperCase()+"%' or (ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            emptyText : "请输入供应商编号或名称", 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                        },{
-                            "text": "供应商编号",
-                            "flex": 1,
-                            "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                        }, {
-                            "text": "供应商名称",
-                            "flex": 1,
-                            "dataIndex": "ve_name",
-                            "xtype": "",
-                        }, {
-                            "text": "供应商类型",
-                            "flex": 0,
-                            "dataIndex": "ve_type",
-                            "width": 200,
-                            "xtype": "",
                         }]
                     }) ;   
 
                 }
             },
             // 仓库编号
-            'dbfindtrigger[name=pr_whcode]':{
+            'warehouseDbfindTrigger[name=pr_whcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/warehouse/list',
-                        //放大镜赋值设置
                         dbfinds:[{
                             from:'id',to:'pr_whid',ignore:true
                         },{
@@ -82,66 +30,14 @@ Ext.define('saas.view.document.product.FormController', {
                         },{
                             from:'wh_description',to:'pr_whname'
                         }],
-                        //新增地址
-                        addXtype:'other-warehouse',
-                        //新增标题
-                        addTitle:'仓库资料', 
-                        //联想查询条件
-                        defaultCondition:"wh_statuscode='OPEN'",
-                        //联想设置
-                        dbtpls:[{
-                            field:'wh_code',width:180
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        //窗口字段设置
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或仓库名称或仓库类型',
-                            xtype : "textfield", 
-                            name : "name", 
-                            allowBlank : true, 
-                            width:260,
-                            getCondition:function(v){
-                                return "((wh_code) like '%"+v.toUpperCase()+"%' or (wh_description) like '%"+v.toUpperCase()+"%'"+
-                                " or (wh_type) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                        },{
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                        },{
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                        }]
                     }) ;   
 
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_whcode]': {
+            'warehouseDbfindTrigger[name=pd_whcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/warehouse/list',
-                        addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
-                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds: [{
                             from: 'id', to: 'pd_whid',ignore:true
                         }, {
@@ -149,50 +45,6 @@ Ext.define('saas.view.document.product.FormController', {
                         }, {
                             from: 'wh_description', to: 'pd_whname'
                         }],
-                        dbtpls: [{
-                            field: 'wh_code',
-                            width: 100
-                        }, {
-                            field: 'wh_description',
-                            width: 100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或名称',
-                            xtype : "textfield", 
-                            name : "wh_code", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],                        
-                        dbColumns: [{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                            "items": null
-                        }]
                     });
                 },
             }

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

@@ -133,7 +133,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         name : "pr_whid", 
         fieldLabel : "仓库ID"
     },{  
-        xtype : "dbfindtrigger",     
+        xtype : "warehouseDbfindTrigger",     
         name : "pr_whcode", 
         fieldLabel : "仓库编号", 
     }, {
@@ -148,7 +148,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         fieldLabel : "供应商ID", 
         columnWidth : 0
     },{
-        xtype : "dbfindtrigger",   
+        xtype : "vendorDbfindTrigger",   
         name : "pr_vendcode", 
         fieldLabel : "供应商编号"
     }, {
@@ -232,17 +232,7 @@ Ext.define('saas.view.document.product.FormPanel', {
             text : "仓库编号", 
             dataIndex : "pd_whcode", 
             editor : {
-                displayField : "display", 
-                editable : true, 
-                format : "", 
-                hideTrigger : false, 
-                maxLength : 100.0, 
-                minValue : null, 
-                positiveNum : false, 
-                queryMode : "local", 
-                store : null, 
-                valueField : "value", 
-                xtype : "dbfindtrigger"
+                xtype : "warehouseDbfindTrigger"
             },
             xtype : "", 
             items : null

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

@@ -5,7 +5,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
     viewModel: 'document-vendor-basepanel',
 
     searchField:[{
-        xtype : "dbfindtrigger", 
+        xtype : "vendorDbfindTrigger", 
         name : "ve_code", 
         emptyText : "供应商编号", 
         width:140,
@@ -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/document/vendor/BasePanelController.js

@@ -6,14 +6,9 @@ Ext.define('saas.view.document.vendor.BasePanelController', {
         var me = this;
         this.control({
             // 主表-供应商名称
-            'dbfindtrigger[name=ve_code]':{
+            'vendorDbfindTrigger[name=ve_code]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         //赋值 
                         dbfinds:[{
                             from:'id',to:'id',ignore:true
@@ -30,69 +25,6 @@ Ext.define('saas.view.document.vendor.BasePanelController', {
                         },{
                             from:'ve_name',to:'ve_name'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }

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

@@ -65,10 +65,6 @@ Ext.define('saas.view.home.charts.MonthSale', {
                     lineWidth: 0,
                     stroke: "#789"
                 },
-                // interactions: [{
-                //     type: 'panzoom',
-                //     zoomOnPan: true
-                // }],
                 series: [{
                     type: 'pie',
                     angleField: 'y',

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',
@@ -79,8 +79,12 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "bandinfoDbfindTrigger"
                 }
+            },{
+                text : "转出账户余额", 
+                dataIndex : "bk_outthisamount", 
+                ignore:true
             }, {
                 text : "转入账户ID", 
                 dataIndex : "ftd_inbankid", 
@@ -106,13 +110,17 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    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,13 +4,9 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=ftd_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle:'资金账户',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_bankcode'
@@ -18,128 +14,26 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             from:'bk_bankname',to:'ftd_bankname'
                         },{
                             from:'id',to:'ftd_bankid',ignore:true
-                        }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
                         },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
+                            from:'bk_thisamount',to:'bk_outthisamount'
                         }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }) ;
                 }
             },
+            //入
             'dbfindtrigger[name=ftd_inbankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle:'资金账户',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_inbankcode'
                         },{
                             from:'bk_bankname',to:'ftd_inbankname'
                         },{
-                            from:'id',to:'ftd_inbankid'
-                        }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
+                            from:'id',to:'ftd_inbankid',ignore:true
                         },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
+                            from:'bk_inthisamount',to:'bk_inthisamount'
                         }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }) ;   
 
                 }

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';
@@ -60,13 +68,17 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             ]
         })
     },{
-        xtype : "dbfindtrigger",
+        xtype : "bandinfoDbfindTrigger",
         name : "ftd_bankname",
         fieldLabel : "转出账号",
     },{
-        xtype : "dbfindtrigger",
+        xtype : "bandinfoDbfindTrigger",
         name : "ftd_inbankname",
         fieldLabel : "转入账号",
+    },{
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -5,141 +5,31 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=ftd_bankname]':{
+            'bandinfoDbfindTrigger[name=ftd_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle:'资金账户',
                         dbfinds:[
                             {
                                 from:'bk_bankcode',to:'ftd_bankcode'
                             },{
                                 from:'bk_bankname',to:'ftd_bankname'
                             },{
-                                from:'id',to:'ftd_bankid'
+                                from:'id',to:'ftd_bankid',ignore:true
                             }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }) ;
                 }
             },
-            'dbfindtrigger[name=ftd_inbankname]':{
+            'bandinfoDbfindTrigger[name=ftd_inbankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle:'资金账户',
                         dbfinds:[
                             {
                                 from:'bk_bankcode',to:'ftd_inbankcode'
                             },{
                                 from:'bk_bankname',to:'ftd_inbankname'
                             },{
-                                from:'id',to:'ftd_inbankid'
+                                from:'id',to:'ftd_inbankid',ignore:true
                             }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }) ;
 
                 }

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

@@ -35,7 +35,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
          name : 'or_custcode', 
          fieldLabel : '客户编号'
      }, {
-         xtype : "dbfindtrigger", 
+         xtype : "customerDbfindTrigger", 
          name : "or_custname", 
          fieldLabel : "客户名称",
          allowBlank : false
@@ -48,7 +48,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
          name : 'or_bankcode', 
          fieldLabel : '账户编号'
      }, {
-         xtype : "dbfindtrigger", 
+         xtype : "bandinfoDbfindTrigger", 
          name : "or_bankname", 
          fieldLabel : "账户名称",
          allowBlank : false
@@ -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

@@ -5,17 +5,12 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=or_custname]': {
+            'customerDbfindTrigger[name=or_custname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition: "cu_statuscode='OPEN'",
                         dbfinds: [{
                             from: 'id',
-                            to: 'or_custid',
-                            ignore:true
+                            to: 'or_custid',ignore:true
                         }, {
                             from: 'cu_code',
                             to: 'or_custcode'
@@ -23,105 +18,14 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             from: 'cu_name',
                             to: 'or_custname'
                         }],
-                        dbtpls: [{
-                            field: 'cu_code',
-                            width: 100
-                        }, {
-                            field: 'cu_name',
-                            width: 100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '输入客户编号或客户名称',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            conditionCode: 'id',
-                            "text": "客户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode: 'cu_code',
-                            "text": "客户编号",
-                            "flex": 1,
-                            "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode: 'cu_name',
-                            "text": "客户名称",
-                            "flex": 1,
-                            "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode: 'cu_type',
-                            "text": "客户类型",
-                            "flex": 1,
-                            "dataIndex": "cu_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "业务员编号",
-                            "flex": 1,
-                            "dataIndex": "cu_sellercode",
-                            "width": 100
-                        }, {
-                            "text": "业务员",
-                            "flex": 1,
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        }, {
-                            "text": "税率",
-                            "flex": 1,
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "flex": 1,
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "额度",
-                            "flex": 1,
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "客户地址",
-                            "flex": 1,
-                            "dataIndex": "ca_address",
-                            "width": 250
-                        }]
                     });
 
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=or_bankname]': {
+            'bandinfoDbfindTrigger[name=or_bankname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'or_bankcode'
@@ -130,63 +34,8 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             to: 'or_bankname'
                         }, {
                             from: 'id',
-                            to: 'or_bankid'
-                        }],
-                        // defaultCondition: "bk_statuscode='OPEN'",
-                        dbtpls: [{
-                            field: 'bk_bankcode',
-                            width: 100
-                        }, {
-                            field: 'bk_bankname',
-                            width: 100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
+                            to: 'or_bankid',ignore:true
                         }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     });
 
                 }

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

@@ -26,7 +26,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         name: 'or_custcode',
         fieldLabel: '客户编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'or_custname',
         fieldLabel: '客户名称',
     }, {
@@ -38,24 +38,32 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         name: 'or_auditman',
         fieldLabel: '审核人'
     },  {
-        xtype: 'dbfindtrigger',
+        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

@@ -5,170 +5,31 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=or_custname]':{
+            'customerDbfindTrigger[name=or_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         dbfinds:[{
-                            from:'id',to:'or_custid'
+                            from:'id',to:'or_custid',ignore:true
                         },{
                             from:'cu_code',to:'or_custcode'
                         },{
                             from:'cu_name',to:'or_custname'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        }],
-                        dbColumns:[
-                            {
-                                conditionCode:'id',
-                                "text": "客户ID",
-                                "flex": 0,
-                                "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
-                            },{
-                                conditionCode:'cu_code',
-                                "text": "客户编号",
-                                "flex": 1,
-                                "dataIndex": "cu_code",
-                                "width": 100,
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                conditionCode:'cu_name',
-                                "text": "客户名称",
-                                "flex": 1,
-                                "dataIndex": "cu_name",
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                conditionCode:'cu_type',
-                                "text": "客户类型",
-                                "flex": 1,
-                                "dataIndex": "cu_type",
-                                "width": 200,
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                "text": "业务员编号",
-                                "flex": 1,
-                                "dataIndex": "cu_sellercode",
-                                "width": 100
-                            }, {
-                                "text": "业务员",
-                                "flex": 1,
-                                "dataIndex": "cu_sellername",
-                                "width": 100
-                            }, {
-                                "text": "税率",
-                                "flex": 1,
-                                "dataIndex": "cu_taxrate",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                            }, {
-                                "text": "承付天数",
-                                "flex": 1,
-                                "dataIndex": "cu_promisedays",
-                                align: 'end',
-                                xtype: 'numbercolumn',
-                                "width": 100, 
-                                renderer : function(v) {
-                                    return Ext.util.Format.number(v, '0');
-                                }
-                            }, {
-                                "text": "额度",
-                                "flex": 1,
-                                "dataIndex": "cu_credit",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                renderer : function(v) {
-                                    var arr = (v + '.').split('.');
-                                    var xr = (new Array(arr[1].length)).fill('0');
-                                    var format = '0,000.' + xr.join();
-                                    return Ext.util.Format.number(v, format);
-                                }
-                            }, {
-                                "text": "客户地址",
-                                "flex": 1,
-                                "dataIndex": "ca_address",
-                                "width": 250
-                            }]
                     }) ;   
 
                 }
           },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=or_bankname]':{
+            'bandinfoDbfindTrigger[name=or_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds:[{
                             from:'bk_bankcode',to:'or_bankcode'
                         },{
                             from:'bk_bankname',to:'or_bankname'
                         },{
-                            from:'id',to:'or_bankid'
-                        }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
+                            from:'id',to:'or_bankid',ignore:true
                         }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     });
 
                 }

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

@@ -35,7 +35,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
          name : 'os_vendcode', 
          fieldLabel : '供应商编号'
      }, {
-         xtype : "dbfindtrigger",
+         xtype : "vendorDbfindTrigger",
          name : "os_vendname", 
          fieldLabel : "供应商名称",
          allowBlank : false
@@ -48,7 +48,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
          name : 'os_bankcode', 
          fieldLabel : '结算账户编号'
      }, {
-         xtype : "dbfindtrigger",
+         xtype : "bandinfoDbfindTrigger",
          name : "os_bankname", 
          fieldLabel : "账户名称",
          allowBlank : false
@@ -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

@@ -5,12 +5,9 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=os_vendname]': {
+            'vendorDbfindTrigger[name=os_vendname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds: [{
                             from: 'id',
                             to: 'os_vendid',
@@ -22,79 +19,14 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             from: 've_name',
                             to: 'os_vendname'
                         }],
-                        dbtpls: [{
-                            field: 've_code',
-                            width: 100
-                        }, {
-                            field: 've_name',
-                            width: 100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     });
 
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=os_bankname]': {
+            'bandinfoDbfindTrigger[name=os_bankname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'os_bankcode'
@@ -103,62 +35,8 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             to: 'os_bankname'
                         }, {
                             from: 'id',
-                            to: 'os_bankid'
-                        }],
-                        dbtpls: [{
-                            field: 'bk_bankcode',
-                            width: 100
-                        }, {
-                            field: 'bk_bankname',
-                            width: 100
+                            to: 'os_bankid',ignore:true
                         }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     });
 
                 }

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

@@ -26,7 +26,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         name: 'os_vendcode',
         fieldLabel: '供应商编号',
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'os_vendname',
         fieldLabel: '供应商名称'
     }, {
@@ -38,7 +38,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         name: 'os_auditman',
         fieldLabel: '审核人',
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'bandinfoDbfindTrigger',
         name: 'os_bankname',
         fieldLabel: '结算账户',
     },{
@@ -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

@@ -8,9 +8,6 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
             'dbfindtrigger[name=os_vendname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds: [{
                             from: 'id',
                             to: 'os_vendid'
@@ -21,71 +18,6 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             from: 've_name',
                             to: 'os_vendname'
                         }],
-                        dbtpls: [{
-                            field: 've_code',
-                            width: 100
-                        }, {
-                            field: 've_name',
-                            width: 100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     });
 
                 }
@@ -94,69 +26,13 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
             'dbfindtrigger[name=os_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'os_bankcode',
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds:[{
                             from:'bk_bankcode',to:'os_bankcode'
                         },{
                             from:'bk_bankname',to:'os_bankname'
                         },{
-                            from:'id',to:'os_bankid'
-                        }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
+                            from:'id',to:'os_bankid',ignore:true
                         }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }); 
 
                 }

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: [],
@@ -50,7 +43,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         name: "pb_vendcode",
         fieldLabel: "供应商编号"
     }, {
-        xtype: "dbfindtrigger",
+        xtype: "vendorDbfindTrigger",
         name: "pb_vendname",
         fieldLabel: "供应商名称",
         allowBlank : false
@@ -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
@@ -120,7 +114,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             dataIndex: 'pd_bankname',
             allowBlank : false,
             editor:{
-                xtype:'dbfindtrigger'
+                xtype:'bandinfoDbfindTrigger'
             }
         },{
             text: '资金账户编号',
@@ -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

@@ -9,9 +9,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             'dbfindtrigger[name=pb_vendname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds: [{
                             from: 've_code',
                             to: 'pb_vendcode'
@@ -26,70 +23,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             to: 'pb_vendid',
                             ignore:true
                         }],
-                        dbtpls: [{
-                            field: 've_code',
-                            width: 100
-                        }, {
-                            field: 've_name',
-                            width: 100
-                        },{
-                            field:'ve_leftamount',
-                            width: 100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100, 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     });
 
                 }
@@ -192,12 +125,9 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             'dbfindtrigger[name=pd_bankname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
-                            to: 'pd_bankid'
+                            to: 'pd_bankid',ignore:true
                         }, {
                             from: 'bk_bankcode',
                             to: 'pd_bankcode'
@@ -205,61 +135,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             from: 'bk_bankname',
                             to: 'pd_bankname'
                         }],
-                        dbtpls: [{
-                            field: 'bk_bankcode',
-                            width: 100
-                        }, {
-                            field: 'bk_bankname',
-                            width: 100
-                        }],
-                        otherConditon:'',
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     });
 
                 }

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

@@ -12,7 +12,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         name: 'pb_code',
         fieldLabel: '单据编号',
     },{
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pb_vendname',
         fieldLabel: '供应商',
     },{
@@ -20,7 +20,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         name: 'pb_manname',
         fieldLabel: '付款人',
     },{
-        xtype: 'dbfindtrigger',
+        xtype: 'bandinfoDbfindTrigger',
         name: 'pd_bankname',
         fieldLabel: '资金账户',
     },{

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

@@ -9,73 +9,9 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
             'dbfindtrigger[name=pb_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_name',to:'pb_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -84,96 +20,11 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }
@@ -181,12 +32,9 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
             'dbfindtrigger[name=pd_bankname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
-                            to: 'pd_bankid'
+                            to: 'pd_bankid',ignore:true
                         }, {
                             from: 'bk_bankcode',
                             to: 'pd_bankcode'
@@ -194,61 +42,6 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                             from: 'bk_bankname',
                             to: 'pd_bankname'
                         }],
-                        dbtpls: [{
-                            field: 'bk_bankcode',
-                            width: 100
-                        }, {
-                            field: 'bk_bankname',
-                            width: 100
-                        }],
-                        otherConditon:'',
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     });
 
                 }

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: [{
@@ -49,7 +42,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         name: 'rb_custcode',
         fieldLabel: '客户编号'
     }, {
-        xtype: "dbfindtrigger",
+        xtype: "customerDbfindTrigger",
         name: "rb_custname",
         fieldLabel: "客户名称",
         allowBlank : false
@@ -126,7 +119,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             allowBlank : false,
             width: 200,
             editor:{
-                xtype:'dbfindtrigger'
+                xtype:'bandinfoDbfindTrigger'
             }
         }, {
             text: "收款金额",
@@ -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/recBalance/FormPanelController.js

@@ -8,10 +8,6 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
             'dbfindtrigger[name=rb_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/customer/list',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid',ignore:true
@@ -22,74 +18,6 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         },{
                             from:'cu_leftamount', to:'cu_leftamount'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        },{
-                            field:'cu_leftamount',width:100
-                        }],
-                        defaultCondition: 'cu_statuscode="OPEN"',
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "应收款余额",
-                            "dataIndex": "cu_leftamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     }) ;   
 
                 }
@@ -97,79 +25,14 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
             'dbfindtrigger[name=rd_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/customer/list',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         //赋值 
                         dbfinds:[{
-                            from: 'id', to: 'rb_custid'
+                            from: 'id', to: 'rb_bankid'
                         }, {
-                            from:'cu_code', to:'rb_custcode'
-                        },{
-                            from:'cu_name', to:'rb_custname'
-                        }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'cu_code',width:100
+                            from:'bk_bankcode', to:'rd_bankcode'
                         },{
-                            field:'cu_name',width:100
+                            from:'bk_bankname', to:'rd_bankname'
                         }],
-                        //联想查询条件
-                        defaultCondition: 'cu_statuscode="OPEN"',
-                        //放大镜窗口字段
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            name : "cu_name", 
-                            getCondition: function(v) {
-                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            fieldLabel : "客户名称", 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     }) ;   
 
                 }
@@ -268,80 +131,6 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
 
                 }
             },
-            'dbfindtrigger[name=rd_bankname]':{
-                beforerender: function (f) {
-                    Ext.apply(f, {
-                        dataUrl: '/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
-                        dbfinds: [{
-                            from: 'id',
-                            to: 'rd_bankid'
-                        }, {
-                            from: 'bk_bankcode',
-                            to: 'rd_bankcode'
-                        },{
-                            from: 'bk_bankname',
-                            to: 'rd_bankname'
-                        }],
-                        dbtpls: [{
-                            field: 'bk_bankcode',
-                            width: 100
-                        }, {
-                            field: 'bk_bankname',
-                            width: 100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
-                    });
-
-                }
-            }
         });
     },
     addCombo:function(){

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         name: 'rb_code',
         fieldLabel: '单据编号',
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'rb_custname',
         fieldLabel: '客户名',
     }, {

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

@@ -5,189 +5,9 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=rd_bankname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl: '/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
-                        },{
-                            from:'ve_name',to:'pu_vendname'
-                        }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
-                    }) ;   
-
-                }
-            },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl: '/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode',
-                        }, {
-                            from:'pr_detail',to:'pr_detail'
-                        }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
-                    }) ;   
-
-                }
-            },
             'dbfindtrigger[name=rb_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/customer/list',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         //赋值
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'
@@ -197,74 +17,6 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                             from:'cu_name', to:'rb_custname'
                         },{
                             from:'cu_leftamount', to:'cu_leftamount'
-                        }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        },{
-                            field:'cu_leftamount',width:100
-                        }],
-                        defaultCondition: 'cu_statuscode="OPEN"',
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "应收款余额",
-                            "dataIndex": "cu_leftamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end',
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
                         }]
                     }) ;
 

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

@@ -7,15 +7,15 @@ Ext.define('saas.view.money.report.AccountBalance', {
 
     viewName: 'money-report-accountbalance',
 
-    groupField: null,
+    groupField: 'bankname',
     listUrl: '/api/money/report/accountBalance',
     defaultCondition: null,
-    reportTitle: '资金账户收支明细',
+    reportTitle: '资金账户余额表',
     QueryWidth:0.25,
     //筛选：账户、日期（必填）
     searchItems: [ {
-        xtype: 'dbfindtrigger',
-        name: 'bankcode',
+        xtype: 'bandinfoDbfindTrigger',
+        name: 'bankname',
         fieldLabel: '账户名称',
         columnWidth: 0.25
     }, {
@@ -44,11 +44,37 @@ Ext.define('saas.view.money.report.AccountBalance', {
         },{
             text:'收入',
             dataIndex:'outamount',
-            xtype: 'numbercolumn'
+            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 > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         },{
             text:'支出',
             dataIndex:'thisamount',
-            xtype: 'numbercolumn'
+            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 > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         },{
             text: '账户余额',
             dataIndex: 'pr_code',
@@ -58,7 +84,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/AccountBalanceController.js

@@ -7,65 +7,10 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
             'dbfindtrigger[name=bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/bankinformation/list',
-                        addXtype: 'other-bankinformation',
-                        addTitle: '资金账户',
                         dbfinds:[
                             {
                                 from:'bk_bankname',to:'bankname'
                             }],
-                        dbtpls:[{
-                            field:'bk_bankcode',width:100
-                        },{
-                            field:'bk_bankname',width:100
-                        }],
-                        dbSearchFields: [{
-                            emptyText: '查找资金账户',
-                            xtype: "textfield",
-                            name: "search",
-                            getCondition: function (v) {
-                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank: true,
-                            columnWidth: 0.25
-                        }],
-                        dbColumns: [{
-                            "text": "账户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": ""
-                        }, {
-                            "text": "资金账户",
-                            "flex": 1,
-                            "dataIndex": "bk_bankcode",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户名称",
-                            "flex": 1,
-                            "dataIndex": "bk_bankname",
-                            "width": 150,
-                            "xtype": ""
-                        }, {
-                            "text": "账户类别",
-                            "flex": 1,
-                            "dataIndex": "bk_type",
-                            "width": 120,
-                            "xtype": ""
-                        }, {
-                            "text": "账户余额",
-                            "flex": 1,
-                            "dataIndex": "bk_thisamount",
-                            "width": 120,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "建帐日期",
-                            "flex": 1,
-                            "dataIndex": "bk_date",
-                            "width": 120,
-                            "xtype": "datecolumn"
-                        }]
                     }) ;
                 }
             }

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
     QueryWidth:0.25,
     //筛选：客户、日期（必填）
     searchItems: [ {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称',
         columnWidth: 0.25
@@ -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/CustomerCheckController.js

@@ -6,80 +6,10 @@ Ext.define('saas.view.money.report.CustomerCheckController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/customer/list',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         //赋值
                         dbfinds:[{
                             from: 'cu_name', to: 'pi_custname'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        }],
-                        defaultCondition: 'cu_statuscode="OPEN"',
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "应收款余额",
-                            "dataIndex": "cu_leftamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     }) ;
 
                 }

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

@@ -13,7 +13,7 @@ Ext.define('saas.view.money.report.PayDetail', {
     QueryWidth:0.25,
     //筛选：供应商、日期（必填）
     searchItems: [ {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         columnWidth: 0.25
@@ -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/PayDetailController.js

@@ -7,76 +7,9 @@ Ext.define('saas.view.money.report.PayDetailController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[
-                            {
-                                "text": "供应商ID",
-                                "hidden": true,
-                                "dataIndex": "id",
-                                "width": 100,
-                                "xtype": "numbercolumn"
-                            },{
-                                "text": "供应商编号",
-                                "dataIndex": "ve_code",
-                                "width": 200
-                            }, {
-                                "text": "供应商名称",
-                                "dataIndex": "ve_name",
-                                "width": 200
-                            }, {
-                                "text": "供应商类型",
-                                "dataIndex": "ve_type",
-                                "width": 180,
-                                "items": null
-                            }, {
-                                "text": "税率",
-                                "dataIndex": "ve_taxrate",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end'
-                            }, {
-                                "text": "承付天数",
-                                "dataIndex": "ve_promisedays",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end', 
-                                renderer : function(v) {
-                                    return Ext.util.Format.number(v, '0');
-                                }
-                            }, {
-                                "text": "纳税人识别号",
-                                "dataIndex": "ve_bankaccount",
-                                "width": 150
-                            }, {
-                                "text": "开户银行",
-                                "dataIndex": "ve_bankaccount",
-                                "width": 100
-                            }, {
-                                "text": "银行账户",
-                                "dataIndex": "ve_bankcode",
-                                "width": 100
-                            }]
                     }) ;
 
                 }

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.report.RecDetail', {
     QueryWidth:0.25,
     //筛选：客户、日期（必填）
     searchItems: [ {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称',
         columnWidth: 0.25
@@ -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/RecDetailController.js

@@ -6,80 +6,10 @@ Ext.define('saas.view.money.report.RecDetailController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl: '/api/document/customer/list',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
                         //赋值
                         dbfinds:[{
                             from: 'cu_name', to: 'pi_custname'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        }],
-                        defaultCondition: 'cu_statuscode="OPEN"',
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或名称',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        },{
-                            "text": "客户编号",
-                            "dataIndex": "cu_code",
-                            "width": 200,
-                        }, {
-                            "text": "客户名称",
-                            "dataIndex": "cu_name",
-                            "width": 200
-                        },{
-                            "text": "客户类型",
-                            "dataIndex": "cu_name",
-                            "width": 100
-                        },{
-                            "text": "业务员",
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        },{
-                            "text": "应收款余额",
-                            "dataIndex": "cu_leftamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "税率",
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "承付天数",
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        },{
-                            "text": "额度",
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }]
                     }) ;
 
                 }

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
     QueryWidth:0.25,
     //筛选：供应商、日期（必填）
     searchItems: [ {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         columnWidth: 0.25
@@ -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/money/report/VendorCheckController.js

@@ -7,76 +7,9 @@ Ext.define('saas.view.money.report.VendorCheckController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[
-                            {
-                                "text": "供应商ID",
-                                "hidden": true,
-                                "dataIndex": "id",
-                                "width": 100,
-                                "xtype": "numbercolumn"
-                            },{
-                                "text": "供应商编号",
-                                "dataIndex": "ve_code",
-                                "width": 200
-                            }, {
-                                "text": "供应商名称",
-                                "dataIndex": "ve_name",
-                                "width": 200
-                            }, {
-                                "text": "供应商类型",
-                                "dataIndex": "ve_type",
-                                "width": 180,
-                                "items": null
-                            }, {
-                                "text": "税率",
-                                "dataIndex": "ve_taxrate",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end'
-                            }, {
-                                "text": "承付天数",
-                                "dataIndex": "ve_promisedays",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end', 
-                                renderer : function(v) {
-                                    return Ext.util.Format.number(v, '0');
-                                }
-                            }, {
-                                "text": "纳税人识别号",
-                                "dataIndex": "ve_bankaccount",
-                                "width": 150
-                            }, {
-                                "text": "开户银行",
-                                "dataIndex": "ve_bankaccount",
-                                "width": 100
-                            }, {
-                                "text": "银行账户",
-                                "dataIndex": "ve_bankcode",
-                                "width": 100
-                            }]
                     }) ;
 
                 }

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     caller:'Purchase',
     
      //字段属性
-     _title:'采购单',
+     _title:'采购订单',
      _idField: 'id',
      _codeField: 'pu_code',
      _statusField: 'pu_status',
@@ -47,7 +47,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         name : "pu_vendcode", 
         fieldLabel : "供应商编号"
     }, {
-        xtype : "dbfindtrigger", 
+        xtype : "vendorDbfindTrigger", 
         name : "pu_vendname", 
         fieldLabel : "供应商名称",
         allowBlank : false,
@@ -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,
@@ -110,17 +111,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 items : null,
                 allowBlank : false,
                 editor : {
-                    displayField : "display", 
-                    editable : true, 
-                    format : "", 
-                    hideTrigger : false, 
-                    maxLength : 100.0, 
-                    minValue : null, 
-                    positiveNum : false, 
-                    queryMode : "local", 
-                    store : null, 
-                    valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },
             {
@@ -199,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);
                 },
@@ -333,7 +324,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         readOnly:true,
         columnWidth : 0.25,
     },{
-        xtype : "dbfindtrigger", 
+        xtype : "employeeDbfindTrigger", 
         name : "pu_buyercode", 
         fieldLabel : "采购员编号",
     },{
@@ -360,7 +351,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "createtime", 
+        name : "createTime", 
         fieldLabel : "录入日期",
         readOnly:true, 
         defaultValue: new Date()
@@ -376,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/purchase/FormPanelController.js

@@ -8,11 +8,6 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         //赋值 
                         dbfinds:[{
                             from:'id',to:'pu_vendid',ignore:true
@@ -21,83 +16,13 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             from:'ve_name',to:'pu_vendname'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            flex:1
-                        }]
-                    }) ;   
-
+                    }) ; 
                 }
             },
             // 主表-采购员名称
             'dbfindtrigger[name=pu_buyercode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/employee/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         //赋值 
                         dbfinds:[{
                             from:'id',to:'pu_buyerid',ignore:true
@@ -105,54 +30,6 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             from:'em_code',to:'pu_buyercode'
                         },{
                             from:'em_name',to:'pu_buyername'
-                        }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'em_code',width:100
-                        },{
-                            field:'em_name',width:100
-                        }],
-                        defaultCondition: "em_class='正式'",
-                        dbSearchFields:[{
-                            emptyText:'输入人员编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(em_code) like '%"+v.toUpperCase()+"%' or upper(em_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "人员ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "人员编号",
-                            "dataIndex": "em_code",
-                            "width": 200
-                        }, {
-                            "text": "人员名称",
-                            "dataIndex": "em_name",
-                            "width": 200
-                        }, {
-                            "text": "类型",
-                            "dataIndex": "em_class",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "手机",
-                            "dataIndex": "em_mobile",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "邮箱",
-                            "dataIndex": "em_email",
-                            "width": 180,
-                            "items": null
                         }]
                     }) ;   
                 }
@@ -161,12 +38,6 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
             'multidbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        // dataUrl:'http://192.168.253.31:9480/product/getProductsByCondition',
-                        // dataUrl:'http://localhost:9480/product/list',
-                        dataUrl: '/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'id',to:'pd_prodid',ignore:true                          
@@ -181,103 +52,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             from:'pr_zxbzs',to:'pr_zxbzs'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            width: 200,
-                            xtype : "textfield", 
-                            name : "search", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%"+ v.toUpperCase() +"%' or upper(pr_spec) like '%"+ v.toUpperCase() +"%')";
-                            }
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        }, {
-                            "text": "最新采购单价",
-                            "dataIndex": "pr_purcprice",
-                            align:'end',
-                            xtype: 'numbercolumn',
-                            "width": 0,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                            "hidden": true
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                var arr = (v + '.').split('.');
-                                var xr = (new Array(arr[1].length)).fill('0');
-                                var format = '0,000.' + xr.join();
-                                return Ext.util.Format.number(v, format);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
-                    }) ;   
+                    });
 
                 }
             },

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

@@ -26,23 +26,23 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         columnWidth: 0.5,
         operation: 'between'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pu_vendcode',
         fieldLabel: '供应商编号',
         hidden:true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pu_vendname',
         fieldLabel: '供应商名称',
         emptyText:'输入供应商编号或名称'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         showDetail: true,
         hidden:true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         showDetail: true,
@@ -85,7 +85,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     queryGridConfig: {
         idField: 'pu_id',
         codeField: 'pu_code',
-        addTitle: '采购单',
+        addTitle: '采购订单',
         addXtype: 'purchase-purchase-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/purchase/purchase/',

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

@@ -9,75 +9,11 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
                             from:'ve_name',to:'pu_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -86,104 +22,11 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                            "hidden": true
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                var arr = (v + '.').split('.');
-                                var xr = (new Array(arr[1].length)).fill('0');
-                                var format = '0,000.' + xr.join();
-                                return Ext.util.Format.number(v, format);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }

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

@@ -57,7 +57,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         name: 'pi_vendcode',
         fieldLabel: '供应商编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         allowBlank : false,
@@ -123,7 +123,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -227,7 +227,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "warehouseDbfindTrigger"
                 }
             },
             {
@@ -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/purchaseIn/FormPanelController.js

@@ -15,12 +15,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-
-                        dataUrl:'/api/document/vendor/list',
-                        // dataUrl:'http://localhost:9480/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pi_vendid',ignore:true
                         },{
@@ -28,69 +22,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -99,10 +30,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'multidbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        // dataUrl:'http://localhost:9480/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'id',to:'pd_prodid',ignore:true                          
                         },{
@@ -120,97 +47,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             from:'pr_purcprice',to:'pd_orderprice'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        },{
-                            field:'pr_spec',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                            "hidden": true
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                var arr = (v + '.').split('.');
-                                var xr = (new Array(arr[1].length)).fill('0');
-                                var format = '0,000.' + xr.join();
-                                return Ext.util.Format.number(v, format);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]                    
                     });   
                 }
             },
@@ -219,11 +55,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/warehouse/list',
-                        // dataUrl:'http://localhost:9480/warehouse/list',
-                        addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
-                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pd_whid',ignore:true                          
                         },{
@@ -231,48 +62,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             from:'wh_description',to:'pd_whname'
                         }],
-                        dbtpls:[{
-                            field:'wh_code',width:100
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或名称',
-                            xtype : "textfield", 
-                            name : "wh_code", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],                        
-                        dbColumns:[{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                            "items": null
-                        }]
                     }) ;   
 
                 }

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

@@ -33,20 +33,20 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         emptyText:'输入供应商编号或名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         hidden:true,
         showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         emptyText:'输入物料编号或名称',

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

@@ -9,77 +9,11 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pi_vendcode'
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -88,10 +22,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_detail',to:'pr_detail',
                         },{
@@ -99,95 +29,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                            "hidden": true
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                var arr = (v + '.').split('.');
-                                var xr = (new Array(arr[1].length)).fill('0');
-                                var format = '0.' + xr.join();
-                                return Ext.util.Format.number(v, format);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }

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

@@ -52,7 +52,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         name: 'pi_vendcode',
         fieldLabel: '供应商编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         allowBlank : false,
@@ -122,7 +122,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -212,7 +212,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "dbfindtrigger"
+                    xtype : "warehouseDbfindTrigger"
                 }
             },
             {
@@ -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/purchase/purchaseOut/FormPanelController.js

@@ -15,11 +15,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        // dataUrl:'http://localhost:9480/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pi_vendid',ignore:true
                         },{
@@ -27,69 +22,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -98,10 +30,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'multidbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        // dataUrl:'http://localhost:9480/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'id',to:'pd_prodid',ignore:true                          
                         },{
@@ -116,101 +44,9 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             from:'pr_whcode',to:'pd_whcode'
                         },{
                             from:'pr_whname',to:'pd_whname'
-                        },,{
-                            from:'pr_purcprice',to:'pd_orderprice'
-                        }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
                         },{
-                            field:'pr_detail',width:100
-                        },{
-                            field:'pr_unit',width:100
+                            from:'pr_purcprice',to:'pd_orderprice'
                         }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],                      
-                        //窗口列设置
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                            "hidden": true
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                var arr = (v + '.').split('.');
-                                var xr = (new Array(arr[1].length)).fill('0');
-                                var format = '0,000.' + xr.join();
-                                return Ext.util.Format.number(v, format);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }
@@ -220,11 +56,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/warehouse/list',
-                        // dataUrl:'http://localhost:9480/warehouse/list',
-                        addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
-                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pd_whid',ignore:true                          
                         },{
@@ -232,48 +63,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         },{
                             from:'wh_description',to:'pd_whname'
                         }],
-                        dbtpls:[{
-                            field:'wh_code',width:100
-                        },{
-                            field:'wh_description',width:100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入仓库编号或名称',
-                            xtype : "textfield", 
-                            name : "wh_code", 
-                            allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
-                            }
-                        }],                        
-                        dbColumns:[{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库类型",
-                            "flex": 1,
-                            "dataIndex": "wh_type",
-                            "xtype": "",
-                            "items": null
-                        }]
                     }) ;   
 
                 }

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

@@ -40,20 +40,20 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
         emptyText:'输入供应商编号或名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         hidden:true,
         showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         emptyText:'输入物料编号或名称',

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

@@ -9,76 +9,11 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pi_vendcode'
                         },{
                             from:'ve_name',to:'pi_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }
@@ -87,103 +22,11 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                            "hidden": true
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            renderer : function(v) {
-                                var arr = (v + '.').split('.');
-                                var xr = (new Array(arr[1].length)).fill('0');
-                                var format = '0,000.' + xr.join();
-                                return Ext.util.Format.number(v, format);
-                            },                            
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]   
                     }) ;   
 
                 }

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     QueryWidth:0.2,
     //筛选：供应商、日期（必填）、业务状态			
     searchItems: [ {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pu_vendname',
         fieldLabel: '供应商名称',
         columnWidth: 0.2

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

@@ -7,76 +7,9 @@ Ext.define('saas.view.purchase.report.PurchaseController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_name',to:'pu_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[
-                        {
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     QueryWidth:0.25,
     searchItems: [
     {
-        xtype: 'dbfindtrigger',
+        xtype: 'vendorDbfindTrigger',
         name: 'pu_vendname',
         fieldLabel: '供应商名称',
         columnWidth: 0.25

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

@@ -7,77 +7,11 @@ Ext.define('saas.view.purchase.report.PurchasePayController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
                             from:'ve_name',to:'pu_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
-                        }],
-                        defaultCondition: "ve_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入供应商编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "供应商ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "供应商编号",
-                            "dataIndex": "ve_code",
-                            "width": 200
-                        }, {
-                            "text": "供应商名称",
-                            "dataIndex": "ve_name",
-                            "width": 200
-                        }, {
-                            "text": "供应商类型",
-                            "dataIndex": "ve_type",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "税率",
-                            "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end'
-                        }, {
-                            "text": "承付天数",
-                            "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align: 'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "纳税人识别号",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 150
-                        }, {
-                            "text": "开户银行",
-                            "dataIndex": "ve_bankaccount",
-                            "width": 100
-                        }, {
-                            "text": "银行账户",
-                            "dataIndex": "ve_bankcode",
-                            "width": 100
-                        }]
                     }) ;   
 
                 }

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.sale.report.Sale', {
     QueryWidth:0.2,
     searchItems: [
     {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'sa_custname',
         fieldLabel: '客户名称',
         columnWidth: 0.2

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

@@ -7,10 +7,6 @@ Ext.define('saas.view.sale.report.SaleController', {
             'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
                                 from:'id',to:'id',ignore:true
@@ -21,92 +17,7 @@ Ext.define('saas.view.sale.report.SaleController', {
                             },{
                                 from:'ca_address',to:'ca_address'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或客户名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[
-                            {
-                                conditionCode:'id',
-                                "text": "客户ID",
-                                "flex": 0,
-                                "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
-                            },{
-                                conditionCode:'cu_code',
-                                "text": "客户编号",
-                                "flex": 1,
-                                "dataIndex": "cu_code",
-                                "width": 100,
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                conditionCode:'cu_name',
-                                "text": "客户名称",
-                                "flex": 1,
-                                "dataIndex": "cu_name",
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                conditionCode:'cu_type',
-                                "text": "客户类型",
-                                "flex": 1,
-                                "dataIndex": "cu_type",
-                                "width": 200,
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                "text": "业务员编号",
-                                "flex": 1,
-                                "dataIndex": "cu_sellercode",
-                                "width": 100
-                            }, {
-                                "text": "业务员",
-                                "flex": 1,
-                                "dataIndex": "cu_sellername",
-                                "width": 100
-                            }, {
-                                "text": "税率",
-                                "flex": 1,
-                                "dataIndex": "cu_taxrate",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                            }, {
-                                "text": "承付天数",
-                                "flex": 1,
-                                "dataIndex": "cu_promisedays",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end', 
-                                renderer : function(v) {
-                                    return Ext.util.Format.number(v, '0');
-                                }
-                            }, {
-                                "text": "额度",
-                                "flex": 1,
-                                "dataIndex": "cu_credit",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                            }, {
-                                "text": "客户地址",
-                                "flex": 1,
-                                "dataIndex": "ca_address",
-                                "width": 250
-                            }]
-                    }) ;   
+                    }) ;
                 }
             }
         });

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

@@ -14,12 +14,12 @@ Ext.define('saas.view.sale.report.SaleProfit', {
 //筛选：客户、物料、时间	
     QueryWidth:0.2, 	
     searchItems: [{
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'sa_custname',
         fieldLabel: '客户',
         columnWidth: 0.2
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_code',
         fieldLabel: '物料',
         columnWidth: 0.2
@@ -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/SaleProfitController.js

@@ -7,10 +7,6 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
             'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
                                 from:'id',to:'id',ignore:true
@@ -21,103 +17,13 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                             },{
                                 from:'ca_address',to:'ca_address'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或客户名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[
-                            {
-                                conditionCode:'id',
-                                "text": "客户ID",
-                                "flex": 0,
-                                "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
-                            },{
-                                conditionCode:'cu_code',
-                                "text": "客户编号",
-                                "flex": 1,
-                                "dataIndex": "cu_code",
-                                "width": 100,
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                conditionCode:'cu_name',
-                                "text": "客户名称",
-                                "flex": 1,
-                                "dataIndex": "cu_name",
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                conditionCode:'cu_type',
-                                "text": "客户类型",
-                                "flex": 1,
-                                "dataIndex": "cu_type",
-                                "width": 200,
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                "text": "业务员编号",
-                                "flex": 1,
-                                "dataIndex": "cu_sellercode",
-                                "width": 100
-                            }, {
-                                "text": "业务员",
-                                "flex": 1,
-                                "dataIndex": "cu_sellername",
-                                "width": 100
-                            }, {
-                                "text": "税率",
-                                "flex": 1,
-                                "dataIndex": "cu_taxrate",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end'
-                            }, {
-                                "text": "承付天数",
-                                "flex": 1,
-                                "dataIndex": "cu_promisedays",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end', 
-                                renderer : function(v) {
-                                    return Ext.util.Format.number(v, '0');
-                                }
-                            }, {
-                                "text": "额度",
-                                "flex": 1,
-                                "dataIndex": "cu_credit",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end'
-                            }, {
-                                "text": "客户地址",
-                                "flex": 1,
-                                "dataIndex": "ca_address",
-                                "width": 250
-                            }]
-                    }) ;   
+                    }) ;
                 }
             },
             //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pr_code]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[
                         {
                             from:'pr_code',to:'pr_code'
@@ -126,88 +32,6 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                         }, {
                             from:'pr_spec',to:'pr_spec'
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }

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

@@ -13,7 +13,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
     reportTitle: '销售收款报表',
     QueryWidth:0.25,
     searchItems: [{//筛选：客户、日期	
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'rb_custname',
         fieldLabel: '客户',
         columnWidth: 0.25
@@ -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/report/SaleRecController.js

@@ -7,10 +7,6 @@ Ext.define('saas.view.sale.report.SaleRecController', {
             'dbfindtrigger[name=rb_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
                                 from:'id',to:'id',ignore:true
@@ -21,93 +17,6 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                             },{
                                 from:'ca_address',to:'ca_address'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或客户名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[
-                            {
-                                conditionCode:'id',
-                                "text": "客户ID",
-                                "flex": 0,
-                                "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
-                            },{
-                                conditionCode:'cu_code',
-                                "text": "客户编号",
-                                "flex": 1,
-                                "dataIndex": "cu_code",
-                                "width": 100,
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                conditionCode:'cu_name',
-                                "text": "客户名称",
-                                "flex": 1,
-                                "dataIndex": "cu_name",
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                conditionCode:'cu_type',
-                                "text": "客户类型",
-                                "flex": 1,
-                                "dataIndex": "cu_type",
-                                "width": 200,
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                "text": "业务员编号",
-                                "flex": 1,
-                                "dataIndex": "cu_sellercode",
-                                "width": 100
-                            }, {
-                                "text": "业务员",
-                                "flex": 1,
-                                "dataIndex": "cu_sellername",
-                                "width": 100
-                            }, {
-                                "text": "税率",
-                                "flex": 1,
-                                "dataIndex": "cu_taxrate",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end'
-                            }, {
-                                "text": "承付天数",
-                                "flex": 1,
-                                "dataIndex": "cu_promisedays",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end', 
-                                renderer : function(v) {
-                                    return Ext.util.Format.number(v, '0');
-                                }
-                            }, {
-                                "text": "额度",
-                                "flex": 1,
-                                "dataIndex": "cu_credit",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align: 'end'
-                            }, {
-                                "text": "客户地址",
-                                "flex": 1,
-                                "dataIndex": "ca_address",
-                                "width": 250
-                            }]
                     }) ;   
                 }
             }

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

@@ -48,19 +48,19 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         name : 'sa_custcode', 
         fieldLabel : '客户编号'
     }, {
-        xtype : "dbfindtrigger", 
+        xtype : "customerDbfindTrigger", 
         name : "sa_custname", 
         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;
@@ -112,7 +112,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "multidbfindtrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',
@@ -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 : "税率", 
@@ -300,7 +296,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         fieldLabel : "单据金额",
         readOnly:true
     },{
-        xtype : "dbfindtrigger", 
+        xtype : "employeeDbfindTrigger", 
         name : "sa_sellercode", 
         fieldLabel : "业务员编号",
     },{
@@ -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/sale/FormPanelController.js

@@ -8,10 +8,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/dbfind',
-                        addXtype: 'document-customer-formpanel',
-                        addTitle: '客户资料',
-                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
                                 from:'id',to:'sa_custid',ignore:true
@@ -22,93 +18,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             },{
                                 from:'ca_address',to:'sa_toplace'
                         }],
-                        dbtpls:[{
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
-                        }],
-                        dbSearchFields:[{
-                            emptyText:'输入客户编号或客户名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[
-                            {
-                                conditionCode:'id',
-                                "text": "客户ID",
-                                "flex": 0,
-                                "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
-                            },{
-                                conditionCode:'cu_code',
-                                "text": "客户编号",
-                                "flex": 1,
-                                "dataIndex": "cu_code",
-                                "width": 100,
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                conditionCode:'cu_name',
-                                "text": "客户名称",
-                                "flex": 1,
-                                "dataIndex": "cu_name",
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                conditionCode:'cu_type',
-                                "text": "客户类型",
-                                "flex": 1,
-                                "dataIndex": "cu_type",
-                                "width": 200,
-                                "xtype": "",
-                                "items": null
-                            }, {
-                                "text": "业务员编号",
-                                "flex": 1,
-                                "dataIndex": "cu_sellercode",
-                                "width": 100
-                            }, {
-                                "text": "业务员",
-                                "flex": 1,
-                                "dataIndex": "cu_sellername",
-                                "width": 100
-                            }, {
-                                "text": "税率",
-                                "flex": 1,
-                                "dataIndex": "cu_taxrate",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align:'end'
-                            }, {
-                                "text": "承付天数",
-                                "flex": 1,
-                                "dataIndex": "cu_promisedays",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align:'end', 
-                                renderer : function(v) {
-                                    return Ext.util.Format.number(v, '0');
-                                }
-                            }, {
-                                "text": "额度",
-                                "flex": 1,
-                                "dataIndex": "cu_credit",
-                                "width": 100,
-                                xtype: 'numbercolumn',
-                                align:'end'
-                            }, {
-                                "text": "客户地址",
-                                "flex": 2,
-                                "dataIndex": "ca_address",
-                                "width": 300
-                            }]
                     }) ;   
 
                 }
@@ -116,11 +25,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             'dbfindtrigger[name=sa_sellercode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        //数据接口
-                        dataUrl:'/api/document/employee/list',
-                        addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
-                        //赋值 
                         dbfinds:[{
                             from:'id',to:'id',ignore:true
                         },{
@@ -128,54 +32,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         },{
                             from:'em_name',to:'sa_seller'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'em_code',width:100
-                        },{
-                            field:'em_name',width:100
-                        }],
-                        defaultCondition: "em_class='正式'",
-                        dbSearchFields:[{
-                            emptyText:'输入人员编号或名称',
-                            xtype : "textfield", 
-                            name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(em_code) like '%"+v.toUpperCase()+"%' or upper(em_name) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        //放大镜窗口列表
-                        dbColumns:[{
-                            "text": "人员ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "人员编号",
-                            "dataIndex": "em_code",
-                            "width": 200
-                        }, {
-                            "text": "人员名称",
-                            "dataIndex": "em_name",
-                            "width": 200
-                        }, {
-                            "text": "类型",
-                            "dataIndex": "em_class",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "手机",
-                            "dataIndex": "em_mobile",
-                            "width": 180,
-                            "items": null
-                        }, {
-                            "text": "邮箱",
-                            "dataIndex": "em_email",
-                            "width": 180,
-                            "items": null
-                        }]
                     }) ;   
                 }
             },
@@ -183,9 +39,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             'multidbfindtrigger[name=sd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/product/list',
-                        addXtype: 'document-product-formpanel',
-                        addTitle: '物料资料',
                         dbfinds:[
                         {
                             from:'pr_code',to:'sd_prodcode'
@@ -198,88 +51,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         }, {
                             from:'id',to:'sd_prodid',ignore:true
                         }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        defaultCondition: "pr_statuscode='OPEN'",
-                        dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
-                            xtype : "textfield", 
-                            name : "search", 
-                            width: 200,
-                            getCondition: function(v) {
-                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true, 
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "hidden": true,
-                            "dataIndex": "id",
-                        }, {
-                            "text": "物料编号",       
-                            "dataIndex": "pr_code",
-                            "width": 200,
-                        }, {
-                            "text": "物料名称",
-                            "width": 200,
-                            "dataIndex": "pr_detail",
-                        }, {
-                            "text": "规格",
-                            "dataIndex": "pr_spec",
-                            "width": 100,
-                        }, {
-                            "text": "单位",
-                            "dataIndex": "pr_unit",
-                            "width": 100,
-                        },{
-                            "text": "仓库id",
-                            "dataIndex": "pr_whid",
-                            "hidden": true,
-                        },{
-                            "text": "仓库编号",
-                            "dataIndex": "pr_whcode",
-                            "hidden": true,
-                        },{
-                            "text": "仓库",
-                            "dataIndex": "pr_whname",
-                            "width": 200,
-                        },{
-                            "text": "总库存数",
-                            "dataIndex": "po_onhand",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "类型",
-                            "dataIndex": "pr_kind",
-                            "width": 100,
-                        },{
-                            "text": "型号",
-                            "dataIndex": "pr_orispeccode",
-                            "width": 100,
-                        },{
-                            "text": "品牌",
-                            "dataIndex": "pr_brand",
-                            "width": 100,
-                        },{
-                            "text": "供应商",
-                            "dataIndex": "pr_vendname",
-                            "width": 100,
-                        },{
-                            "text": "最小包装",
-                            "dataIndex": "pr_zxbzs",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "L/T",
-                            "dataIndex": "pr_leadtime",
-                            "width": 100,
-                        }]
                     }) ;   
 
                 }

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

@@ -26,7 +26,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         name: 'sa_custcode',
         fieldLabel: '客户编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'customerDbfindTrigger',
         name: 'sa_custname',
         fieldLabel: '客户名称'
     }, {
@@ -35,7 +35,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         fieldLabel: '物料编号',
         showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         showDetail: true