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

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/BankinformationController.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2018/10/25 15:33
  **/
 @RestController
-@RequestMapping("/Bankinformation")
+@RequestMapping("/bankinformation")
 public class BankinformationController {
     @Autowired
     BankinformationService bankinformationService;

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.saas.document.mapper.BankinformationMapper" >
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.po.Bankinformation" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Bankinformation" >
     <id column="bk_id" property="bkId" jdbcType="INTEGER" />
     <result column="bk_bankcode" property="bkBankcode" jdbcType="VARCHAR" />
     <result column="bk_bankname" property="bkBankname" jdbcType="VARCHAR" />
@@ -24,7 +24,7 @@
     <result column="bk_text4" property="bkText4" jdbcType="VARCHAR" />
     <result column="bk_text5" property="bkText5" jdbcType="VARCHAR" />
   </resultMap>
-  <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.document.po.Bankinformation" extends="BaseResultMap" >
+  <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.document.entities.Bankinformation" extends="BaseResultMap" >
     <result column="bk_remark" property="bkRemark" jdbcType="LONGVARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
@@ -47,7 +47,7 @@
     delete from bankinformation
     where bk_id = #{bkId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.document.po.Bankinformation" >
+  <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     insert into bankinformation (bk_id, bk_bankcode, bk_bankname, 
       bk_date, bk_type, bk_beginamount, 
       bk_thisamount, bk_status, bk_statuscode, 
@@ -65,7 +65,7 @@
       #{bkText3,jdbcType=VARCHAR}, #{bkText4,jdbcType=VARCHAR}, #{bkText5,jdbcType=VARCHAR}, 
       #{bkRemark,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.document.po.Bankinformation" >
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     insert into bankinformation
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="bkId != null" >
@@ -204,7 +204,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.po.Bankinformation" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     update bankinformation
     <set >
       <if test="bkBankcode != null" >
@@ -273,7 +273,7 @@
     </set>
     where bk_id = #{bkId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.document.po.Bankinformation" >
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     update bankinformation
     set bk_bankcode = #{bkBankcode,jdbcType=VARCHAR},
       bk_bankname = #{bkBankname,jdbcType=VARCHAR},
@@ -298,7 +298,7 @@
       bk_remark = #{bkRemark,jdbcType=LONGVARCHAR}
     where bk_id = #{bkId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.po.Bankinformation" >
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     update bankinformation
     set bk_bankcode = #{bkBankcode,jdbcType=VARCHAR},
       bk_bankname = #{bkBankname,jdbcType=VARCHAR},

applications/money/money-server/src/main/java/com/usoftchina/saas/money/MoneyApplicatiion.java

@@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 //import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
@@ -12,7 +13,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  * @create: 2018-10-20 11:29
  **/
 @SpringBootApplication
-//@EnableEurekaClient
+@EnableEurekaClient
 @EnableTransactionManagement
 @EnableFeignClients("com.usoftchina.saas")
 //@EnableAuthClient

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/FundtransferController.java

@@ -0,0 +1,58 @@
+package com.usoftchina.saas.money.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.money.po.Fundtran;
+import com.usoftchina.saas.money.po.Fundtransfer;
+import com.usoftchina.saas.money.service.FundtransferService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author heqw
+ * @date 2018/10/25 19:21
+ **/
+@RestController
+@RequestMapping("/money/fundtransfer")
+public class FundtransferController {
+    @Autowired
+    private FundtransferService fundtransferService;
+
+    @RequestMapping("/save")
+    public Result insert(@RequestBody Fundtran body) {
+        int id = fundtransferService.insert(body);
+        return Result.success(id);
+    }
+
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody int id){
+        fundtransferService.delete(id);
+        return Result.success();
+    }
+
+
+    @GetMapping("/read")
+    public Result read(int id){
+        return Result.success(fundtransferService.select(id));
+    }
+
+    @GetMapping("/List")
+    public Result getList(PageRequest page){
+        PageInfo<Fundtransfer> list = fundtransferService.selectList(page);
+        return Result.success(list);
+    }
+
+    @RequestMapping("/audit")
+    public Result audit(@RequestBody Fundtran body){
+        fundtransferService.audit(body);
+        return Result.success();
+    }
+
+    @PostMapping("/unAudit")
+    public Result unAudit(@RequestBody int id){
+        fundtransferService.unAudit(id);
+        return Result.success();
+    }
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/OthreceiptsController.java

@@ -7,10 +7,7 @@ import com.usoftchina.saas.money.po.Othte;
 import com.usoftchina.saas.money.service.OthreceiptsService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author heqw
@@ -29,12 +26,13 @@ public class OthreceiptsController {
     }
 
 
-    @GetMapping("/delete")
-    public Result deletePaybalance(int id){
+    @PostMapping("/delete")
+    public Result deletePaybalance(@RequestBody int id){
         othreceiptsService.delete(id);
         return Result.success();
     }
 
+
     @GetMapping("/read")
     public Result getPaybalance(int id){
         return Result.success(othreceiptsService.select(id));
@@ -52,8 +50,8 @@ public class OthreceiptsController {
         return Result.success();
     }
 
-    @GetMapping("/unAudit")
-    public Result unAudit(int id){
+    @PostMapping("/unAudit")
+    public Result unAudit(@RequestBody int id){
         othreceiptsService.unAudit(id);
         return Result.success();
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/OthspengdingsController.java

@@ -10,10 +10,7 @@ import com.usoftchina.saas.money.service.OthspendingsService;
 import com.usoftchina.saas.page.PageRequest;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author heqw
@@ -32,12 +29,18 @@ public class OthspengdingsController {
     }
 
 
-    @GetMapping("/delete")
-    public Result deletePaybalance(int id){
+    @PostMapping("/delete")
+    public Result deletePaybalance(@RequestBody int id){
         othspendingsService.delete(id);
         return Result.success();
     }
 
+    @PostMapping("/deleteItem/")
+    public Result deleteItem(@RequestBody int id){
+        othspendingsService.deleteItem(id);
+        return Result.success();
+    }
+
     @GetMapping("/read")
     public Result getPaybalance(int id){
         return Result.success(othspendingsService.select(id));
@@ -55,8 +58,8 @@ public class OthspengdingsController {
         return Result.success();
     }
 
-    @GetMapping("/unAudit")
-    public Result unAudit(int id){
+    @PostMapping("/unAudit")
+    public Result unAudit(@RequestBody int id){
         othspendingsService.unAudit(id);
         return Result.success();
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/PaybalanceController.java

@@ -8,17 +8,14 @@ import com.usoftchina.saas.money.po.Paybalance;
 import com.usoftchina.saas.money.service.PaybalanceService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author heqw
  * @date 2018/10/22 15:03
  **/
 @RestController
-@RequestMapping("/money")
+@RequestMapping("/money/Paybalance")
 public class PaybalanceController {
     @Autowired
     private PaybalanceService paybalanceService;
@@ -30,12 +27,18 @@ public class PaybalanceController {
     }
 
 
-    @GetMapping("/delete")
-    public Result deletePaybalance(int id){
+    @PostMapping("/delete")
+    public Result deletePaybalance(@RequestBody int id){
         paybalanceService.delete(id);
         return Result.success();
     }
 
+    @PostMapping("/deleteItem/")
+    public Result deleteItem(@RequestBody int id){
+        paybalanceService.deleteItem(id);
+        return Result.success();
+    }
+
     @GetMapping("/read")
     public Result getPaybalance(int id){
         return Result.success(paybalanceService.select(id));
@@ -53,8 +56,8 @@ public class PaybalanceController {
         return Result.success();
     }
 
-    @GetMapping("/unAudit")
-    public Result unAudit(int id){
+    @PostMapping("/unAudit")
+    public Result unAudit(@RequestBody int id){
         paybalanceService.unAudit(id);
         return Result.success();
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/RecbalanceContorller.java

@@ -23,15 +23,15 @@ public class RecbalanceContorller {
         return Result.success();
     }
 
-    @GetMapping("/delete")
-    public Result delete(int id){
+    @PostMapping("/delete")
+    public Result delete(@RequestBody int id){
         recbalanceService.delect(id);
         return Result.success();
     }
 
-    @GetMapping("/deleteItem/{id}")
-    public Result deleteItem(@PathVariable int id){
-        recbalanceService.delectItem(id);
+    @PostMapping("/deleteItem/")
+    public Result deleteItem(@RequestBody int id){
+        recbalanceService.deleteItem(id);
         return Result.success();
     }
 
@@ -51,8 +51,8 @@ public class RecbalanceContorller {
         return Result.success();
     }
 
-    @GetMapping("/unAudit")
-    public Result unAudit(int id){
+    @PostMapping("/unAudit")
+    public Result unAudit(@RequestBody int id){
         recbalanceService.unAudit(id);
         return Result.success();
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/FundtransferMapper.java

@@ -0,0 +1,21 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.Fundtransfer;
+
+import java.util.List;
+
+public interface FundtransferMapper {
+    int deleteByPrimaryKey(Integer ftId);
+    int deleteItem(int id);
+
+    int insert(Fundtransfer record);
+
+    int insertSelective(Fundtransfer record);
+    List<Fundtransfer> selectList();
+
+    Fundtransfer selectByPrimaryKey(Integer ftId);
+
+    int updateByPrimaryKeySelective(Fundtransfer record);
+
+    int updateByPrimaryKey(Fundtransfer record);
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/FundtransferdetailMapper.java

@@ -0,0 +1,18 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.Fundtransferdetail;
+
+public interface FundtransferdetailMapper {
+    int deleteByPrimaryKey(Integer ftdId);
+    int deleteItem(int id);
+
+    int insert(Fundtransferdetail record);
+
+    int insertSelective(Fundtransferdetail record);
+
+    Fundtransferdetail selectByPrimaryKey(Integer ftdId);
+
+    int updateByPrimaryKeySelective(Fundtransferdetail record);
+
+    int updateByPrimaryKey(Fundtransferdetail record);
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Fundtran.java

@@ -0,0 +1,28 @@
+package com.usoftchina.saas.money.po;
+
+import java.util.List;
+
+/**
+ * @author heqw
+ * @date 2018/10/25 19:28
+ **/
+public class Fundtran {
+    private Fundtransfer main;
+    private List<Fundtransferdetail> items;
+
+    public Fundtransfer getMain() {
+        return main;
+    }
+
+    public void setMain(Fundtransfer main) {
+        this.main = main;
+    }
+
+    public List<Fundtransferdetail> getItems() {
+        return items;
+    }
+
+    public void setItems(List<Fundtransferdetail> items) {
+        this.items = items;
+    }
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Fundtransfer.java

@@ -0,0 +1,175 @@
+package com.usoftchina.saas.money.po;
+
+import java.util.Date;
+
+public class Fundtransfer {
+    private Integer ftId;
+
+    private String ftCode;
+
+    private Date ftDate;
+
+    private Integer ftRecorderid;
+
+    private String ftRecorder;
+
+    private Date ftRecorddate;
+
+    private String ftStatus;
+
+    private String ftStatuscode;
+
+    private String ftRemark;
+
+    private Integer companyid;
+
+    private Integer updaterid;
+
+    private Date updatedate;
+
+    private String ftText1;
+
+    private String ftText2;
+
+    private String ftText3;
+
+    private String ftText4;
+
+    private String ftText5;
+
+    public Integer getFtId() {
+        return ftId;
+    }
+
+    public void setFtId(Integer ftId) {
+        this.ftId = ftId;
+    }
+
+    public String getFtCode() {
+        return ftCode;
+    }
+
+    public void setFtCode(String ftCode) {
+        this.ftCode = ftCode == null ? null : ftCode.trim();
+    }
+
+    public Date getFtDate() {
+        return ftDate;
+    }
+
+    public void setFtDate(Date ftDate) {
+        this.ftDate = ftDate;
+    }
+
+    public Integer getFtRecorderid() {
+        return ftRecorderid;
+    }
+
+    public void setFtRecorderid(Integer ftRecorderid) {
+        this.ftRecorderid = ftRecorderid;
+    }
+
+    public String getFtRecorder() {
+        return ftRecorder;
+    }
+
+    public void setFtRecorder(String ftRecorder) {
+        this.ftRecorder = ftRecorder == null ? null : ftRecorder.trim();
+    }
+
+    public Date getFtRecorddate() {
+        return ftRecorddate;
+    }
+
+    public void setFtRecorddate(Date ftRecorddate) {
+        this.ftRecorddate = ftRecorddate;
+    }
+
+    public String getFtStatus() {
+        return ftStatus;
+    }
+
+    public void setFtStatus(String ftStatus) {
+        this.ftStatus = ftStatus == null ? null : ftStatus.trim();
+    }
+
+    public String getFtStatuscode() {
+        return ftStatuscode;
+    }
+
+    public void setFtStatuscode(String ftStatuscode) {
+        this.ftStatuscode = ftStatuscode == null ? null : ftStatuscode.trim();
+    }
+
+    public String getFtRemark() {
+        return ftRemark;
+    }
+
+    public void setFtRemark(String ftRemark) {
+        this.ftRemark = ftRemark == null ? null : ftRemark.trim();
+    }
+
+    public Integer getCompanyid() {
+        return companyid;
+    }
+
+    public void setCompanyid(Integer companyid) {
+        this.companyid = companyid;
+    }
+
+    public Integer getUpdaterid() {
+        return updaterid;
+    }
+
+    public void setUpdaterid(Integer updaterid) {
+        this.updaterid = updaterid;
+    }
+
+    public Date getUpdatedate() {
+        return updatedate;
+    }
+
+    public void setUpdatedate(Date updatedate) {
+        this.updatedate = updatedate;
+    }
+
+    public String getFtText1() {
+        return ftText1;
+    }
+
+    public void setFtText1(String ftText1) {
+        this.ftText1 = ftText1 == null ? null : ftText1.trim();
+    }
+
+    public String getFtText2() {
+        return ftText2;
+    }
+
+    public void setFtText2(String ftText2) {
+        this.ftText2 = ftText2 == null ? null : ftText2.trim();
+    }
+
+    public String getFtText3() {
+        return ftText3;
+    }
+
+    public void setFtText3(String ftText3) {
+        this.ftText3 = ftText3 == null ? null : ftText3.trim();
+    }
+
+    public String getFtText4() {
+        return ftText4;
+    }
+
+    public void setFtText4(String ftText4) {
+        this.ftText4 = ftText4 == null ? null : ftText4.trim();
+    }
+
+    public String getFtText5() {
+        return ftText5;
+    }
+
+    public void setFtText5(String ftText5) {
+        this.ftText5 = ftText5 == null ? null : ftText5.trim();
+    }
+}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Fundtransferdetail.java

@@ -0,0 +1,225 @@
+package com.usoftchina.saas.money.po;
+
+import java.util.Date;
+
+public class Fundtransferdetail {
+    private Integer ftdId;
+
+    private Integer ftdFtid;
+
+    private Integer ftdDetno;
+
+    private Integer ftdYm;
+
+    private Integer ftdBankid;
+
+    private String ftdBankcode;
+
+    private String ftdBankname;
+
+    private Integer ftdInbankid;
+
+    private String ftdInbankcode;
+
+    private String ftdInbankname;
+
+    private Double ftdNowbalance;
+
+    private String ftdPaymethod;
+
+    private String ftdPaycode;
+
+    private String ftdRemark;
+
+    private Integer companyid;
+
+    private Integer updaterid;
+
+    private Date updatedate;
+
+    private String ftdText1;
+
+    private String ftdText2;
+
+    private String ftdText3;
+
+    private String ftdText4;
+
+    private String ftdText5;
+
+    public Integer getFtdId() {
+        return ftdId;
+    }
+
+    public void setFtdId(Integer ftdId) {
+        this.ftdId = ftdId;
+    }
+
+    public Integer getFtdFtid() {
+        return ftdFtid;
+    }
+
+    public void setFtdFtid(Integer ftdFtid) {
+        this.ftdFtid = ftdFtid;
+    }
+
+    public Integer getFtdDetno() {
+        return ftdDetno;
+    }
+
+    public void setFtdDetno(Integer ftdDetno) {
+        this.ftdDetno = ftdDetno;
+    }
+
+    public Integer getFtdYm() {
+        return ftdYm;
+    }
+
+    public void setFtdYm(Integer ftdYm) {
+        this.ftdYm = ftdYm;
+    }
+
+    public Integer getFtdBankid() {
+        return ftdBankid;
+    }
+
+    public void setFtdBankid(Integer ftdBankid) {
+        this.ftdBankid = ftdBankid;
+    }
+
+    public String getFtdBankcode() {
+        return ftdBankcode;
+    }
+
+    public void setFtdBankcode(String ftdBankcode) {
+        this.ftdBankcode = ftdBankcode == null ? null : ftdBankcode.trim();
+    }
+
+    public String getFtdBankname() {
+        return ftdBankname;
+    }
+
+    public void setFtdBankname(String ftdBankname) {
+        this.ftdBankname = ftdBankname == null ? null : ftdBankname.trim();
+    }
+
+    public Integer getFtdInbankid() {
+        return ftdInbankid;
+    }
+
+    public void setFtdInbankid(Integer ftdInbankid) {
+        this.ftdInbankid = ftdInbankid;
+    }
+
+    public String getFtdInbankcode() {
+        return ftdInbankcode;
+    }
+
+    public void setFtdInbankcode(String ftdInbankcode) {
+        this.ftdInbankcode = ftdInbankcode == null ? null : ftdInbankcode.trim();
+    }
+
+    public String getFtdInbankname() {
+        return ftdInbankname;
+    }
+
+    public void setFtdInbankname(String ftdInbankname) {
+        this.ftdInbankname = ftdInbankname == null ? null : ftdInbankname.trim();
+    }
+
+    public Double getFtdNowbalance() {
+        return ftdNowbalance;
+    }
+
+    public void setFtdNowbalance(Double ftdNowbalance) {
+        this.ftdNowbalance = ftdNowbalance;
+    }
+
+    public String getFtdPaymethod() {
+        return ftdPaymethod;
+    }
+
+    public void setFtdPaymethod(String ftdPaymethod) {
+        this.ftdPaymethod = ftdPaymethod == null ? null : ftdPaymethod.trim();
+    }
+
+    public String getFtdPaycode() {
+        return ftdPaycode;
+    }
+
+    public void setFtdPaycode(String ftdPaycode) {
+        this.ftdPaycode = ftdPaycode == null ? null : ftdPaycode.trim();
+    }
+
+    public String getFtdRemark() {
+        return ftdRemark;
+    }
+
+    public void setFtdRemark(String ftdRemark) {
+        this.ftdRemark = ftdRemark == null ? null : ftdRemark.trim();
+    }
+
+    public Integer getCompanyid() {
+        return companyid;
+    }
+
+    public void setCompanyid(Integer companyid) {
+        this.companyid = companyid;
+    }
+
+    public Integer getUpdaterid() {
+        return updaterid;
+    }
+
+    public void setUpdaterid(Integer updaterid) {
+        this.updaterid = updaterid;
+    }
+
+    public Date getUpdatedate() {
+        return updatedate;
+    }
+
+    public void setUpdatedate(Date updatedate) {
+        this.updatedate = updatedate;
+    }
+
+    public String getFtdText1() {
+        return ftdText1;
+    }
+
+    public void setFtdText1(String ftdText1) {
+        this.ftdText1 = ftdText1 == null ? null : ftdText1.trim();
+    }
+
+    public String getFtdText2() {
+        return ftdText2;
+    }
+
+    public void setFtdText2(String ftdText2) {
+        this.ftdText2 = ftdText2 == null ? null : ftdText2.trim();
+    }
+
+    public String getFtdText3() {
+        return ftdText3;
+    }
+
+    public void setFtdText3(String ftdText3) {
+        this.ftdText3 = ftdText3 == null ? null : ftdText3.trim();
+    }
+
+    public String getFtdText4() {
+        return ftdText4;
+    }
+
+    public void setFtdText4(String ftdText4) {
+        this.ftdText4 = ftdText4 == null ? null : ftdText4.trim();
+    }
+
+    public String getFtdText5() {
+        return ftdText5;
+    }
+
+    public void setFtdText5(String ftdText5) {
+        this.ftdText5 = ftdText5 == null ? null : ftdText5.trim();
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.usoftchina.saas.money.service;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.money.po.Fundtran;
+import com.usoftchina.saas.money.po.Fundtransfer;
+import com.usoftchina.saas.page.PageRequest;
+
+/**
+ * @author heqw
+ * @date 2018/10/25 19:26
+ **/
+public interface FundtransferService {
+    int insert(Fundtran fundtran);
+
+    void audit(Fundtran fundtran);
+
+    void unAudit(int id);
+
+    void delete(int id);
+
+    Fundtran select(int id);
+
+    PageInfo<Fundtransfer> selectList(PageRequest page);
+}

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

@@ -17,7 +17,7 @@ public interface OthspendingsService {
 
     void delete(int id);
 
-    void delectItem(int id);
+    void deleteItem(int id);
 
     Othsp select(int id);
 

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

@@ -19,7 +19,7 @@ public interface PaybalanceService {
 
     void delete(int id);
 
-    void delectItem(int id);
+    void deleteItem(int id);
 
     Pay select(int id);
 

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

@@ -13,9 +13,12 @@ import com.usoftchina.saas.page.PageRequest;
 public interface RecbalanceService {
     int insert(Rec rec);
     void delect(int id);
-    void delectItem(int id);
+
+    void deleteItem(int id);
+
     Rec select(int id);
 
+
     void audit(Rec rec);
 
     void unAudit(int id);

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

@@ -0,0 +1,106 @@
+package com.usoftchina.saas.money.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.po.Status;
+import com.usoftchina.saas.money.mapper.FundtransferMapper;
+import com.usoftchina.saas.money.mapper.FundtransferdetailMapper;
+import com.usoftchina.saas.money.po.Fundtran;
+import com.usoftchina.saas.money.po.Fundtransfer;
+import com.usoftchina.saas.money.po.Fundtransferdetail;
+import com.usoftchina.saas.money.service.FundtransferService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @author heqw
+ * @date 2018/10/25 19:32
+ **/
+@Service
+public class FundtransferServiceImpl implements FundtransferService {
+    @Autowired
+    private FundtransferMapper fundtransferMapper;
+    @Autowired
+    private FundtransferdetailMapper fundtransferdetailMapper;
+
+    @Override
+    public int insert(Fundtran fundtran) {
+        Fundtransfer fundtransfer = fundtran.getMain();
+        List<Fundtransferdetail> fundtransferdetails = fundtran.getItems();
+
+        if (fundtransfer.getFtId() > 0){
+            fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
+        }else {
+            fundtransferMapper.insert(fundtransfer);
+        }
+
+        Iterator isdet = fundtransferdetails.iterator();
+        while (isdet.hasNext()){
+            Fundtransferdetail fundtransferdetail= (Fundtransferdetail) isdet.next();
+            if (fundtransferdetail.getFtdId() > 0 ){
+                fundtransferdetailMapper.updateByPrimaryKey(fundtransferdetail);
+            }else {
+                fundtransferdetailMapper.insertSelective(fundtransferdetail);
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public void audit(Fundtran fundtran) {
+        int id = fundtran.getMain().getFtId();
+        Fundtransfer fundtransfer = fundtransferMapper.selectByPrimaryKey(id);
+        if ( fundtransfer == null || "".equals(fundtransfer)){
+            this.insert(fundtran);
+        }else {
+            fundtransferMapper.updateByPrimaryKey(fundtransfer);
+        }
+    }
+
+    @Override
+    public void unAudit(int id) {
+        Fundtransfer fundtransfer = new Fundtransfer();
+        fundtransfer.setFtId(id);
+        fundtransfer.setFtStatus(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
+        fundtransfer.setFtStatuscode(Status.UNAUDITED.name());
+        fundtransferMapper.updateByPrimaryKey(fundtransfer);
+    }
+
+
+    @Override
+    public void delete(int id) {
+        fundtransferMapper.deleteByPrimaryKey(id);
+        fundtransferdetailMapper.deleteByPrimaryKey(id);
+    }
+
+    public void deleteItem(int id) {
+        fundtransferdetailMapper.deleteItem(id);
+    }
+
+    @Override
+    public Fundtran select(int id) {
+        Fundtran fundtran = new Fundtran();
+        fundtran.setMain(fundtransferMapper.selectByPrimaryKey(id));
+        fundtran.setItems((List<Fundtransferdetail>) fundtransferdetailMapper.selectByPrimaryKey(id));
+        return fundtran;
+    }
+
+    @Override
+    public PageInfo<Fundtransfer> selectList(PageRequest page) {
+        //设置默认分页
+        if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
+            page = new PageRequest();
+            page.setNumber(1);
+            page.setSize(10);
+        }
+        PageHelper.startPage(page.getNumber(), page.getSize());
+        List<Fundtransfer> fundtransfers = fundtransferMapper.selectList();
+        //取分页信息
+        PageInfo<Fundtransfer> pageInfo = new PageInfo<>(fundtransfers);
+        return pageInfo;
+    }
+}

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

@@ -57,7 +57,7 @@ public class OthspendingsServiceImpl implements OthspendingsService {
     }
 
     @Override
-    public void delectItem(int id) {
+    public void deleteItem(int id) {
         othspendingsdetailMapper.deleteItem(id);
     }
 

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

@@ -89,7 +89,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
     }
 
     @Override
-    public void delectItem(int id) {
+    public void deleteItem(int id) {
         paybalancedetailMapper.deleteItem(id);
         paybalancedetMapper.deleteItem(id);
     }

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

@@ -70,12 +70,6 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         recbalancedetailMapper.deleteByPrimaryKey(id);
     }
 
-    @Override
-    public void delectItem(int id) {
-        recbalancedetMapper.deleteItem(id);
-        recbalancedetailMapper.deleteItem(id);
-    }
-
     @Override
     public Rec select(int id) {
         Recbalance recbalance = recbalanceMapper.selectByPrimaryKey(id);
@@ -88,6 +82,12 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         return rec;
     }
 
+    @Override
+    public void deleteItem(int id) {
+        recbalancedetailMapper.deleteItem(id);
+        recbalancedetMapper.deleteItem(id);
+    }
+
     @Override
     public void audit(Rec rec) {
         int id = rec.getMain().getRb_id();

applications/money/money-server/src/main/resources/mapper/FundtransferMapper.xml

@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.FundtransferMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Fundtransfer" >
+    <id column="ft_id" property="ftId" jdbcType="INTEGER" />
+    <result column="ft_code" property="ftCode" jdbcType="VARCHAR" />
+    <result column="ft_date" property="ftDate" jdbcType="TIMESTAMP" />
+    <result column="ft_recorderid" property="ftRecorderid" jdbcType="INTEGER" />
+    <result column="ft_recorder" property="ftRecorder" jdbcType="VARCHAR" />
+    <result column="ft_recorddate" property="ftRecorddate" jdbcType="TIMESTAMP" />
+    <result column="ft_status" property="ftStatus" jdbcType="VARCHAR" />
+    <result column="ft_statuscode" property="ftStatuscode" jdbcType="VARCHAR" />
+    <result column="ft_remark" property="ftRemark" jdbcType="VARCHAR" />
+    <result column="companyid" property="companyid" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="ft_text1" property="ftText1" jdbcType="VARCHAR" />
+    <result column="ft_text2" property="ftText2" jdbcType="VARCHAR" />
+    <result column="ft_text3" property="ftText3" jdbcType="VARCHAR" />
+    <result column="ft_text4" property="ftText4" jdbcType="VARCHAR" />
+    <result column="ft_text5" property="ftText5" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    ft_id, ft_code, ft_date, ft_recorderid, ft_recorder, ft_recorddate, ft_status, ft_statuscode, 
+    ft_remark, companyid, updaterId, updatedate, ft_text1, ft_text2, ft_text3, ft_text4, 
+    ft_text5
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from fundtransfer
+    where ft_id = #{ftId,jdbcType=INTEGER}
+  </select>
+
+  <select id="selectList" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from fundtransfer
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from fundtransfer
+    where ft_id = #{ftId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
+    insert into fundtransfer (ft_id, ft_code, ft_date, 
+      ft_recorderid, ft_recorder, ft_recorddate, 
+      ft_status, ft_statuscode, ft_remark, 
+      companyid, updaterId, updatedate, 
+      ft_text1, ft_text2, ft_text3, 
+      ft_text4, ft_text5)
+    values (#{ftId,jdbcType=INTEGER}, #{ftCode,jdbcType=VARCHAR}, #{ftDate,jdbcType=TIMESTAMP}, 
+      #{ftRecorderid,jdbcType=INTEGER}, #{ftRecorder,jdbcType=VARCHAR}, #{ftRecorddate,jdbcType=TIMESTAMP}, 
+      #{ftStatus,jdbcType=VARCHAR}, #{ftStatuscode,jdbcType=VARCHAR}, #{ftRemark,jdbcType=VARCHAR}, 
+      #{companyid,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, 
+      #{ftText1,jdbcType=VARCHAR}, #{ftText2,jdbcType=VARCHAR}, #{ftText3,jdbcType=VARCHAR}, 
+      #{ftText4,jdbcType=VARCHAR}, #{ftText5,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
+    insert into fundtransfer
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="ftId != null" >
+        ft_id,
+      </if>
+      <if test="ftCode != null" >
+        ft_code,
+      </if>
+      <if test="ftDate != null" >
+        ft_date,
+      </if>
+      <if test="ftRecorderid != null" >
+        ft_recorderid,
+      </if>
+      <if test="ftRecorder != null" >
+        ft_recorder,
+      </if>
+      <if test="ftRecorddate != null" >
+        ft_recorddate,
+      </if>
+      <if test="ftStatus != null" >
+        ft_status,
+      </if>
+      <if test="ftStatuscode != null" >
+        ft_statuscode,
+      </if>
+      <if test="ftRemark != null" >
+        ft_remark,
+      </if>
+      <if test="companyid != null" >
+        companyid,
+      </if>
+      <if test="updaterid != null" >
+        updaterId,
+      </if>
+      <if test="updatedate != null" >
+        updatedate,
+      </if>
+      <if test="ftText1 != null" >
+        ft_text1,
+      </if>
+      <if test="ftText2 != null" >
+        ft_text2,
+      </if>
+      <if test="ftText3 != null" >
+        ft_text3,
+      </if>
+      <if test="ftText4 != null" >
+        ft_text4,
+      </if>
+      <if test="ftText5 != null" >
+        ft_text5,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="ftId != null" >
+        #{ftId,jdbcType=INTEGER},
+      </if>
+      <if test="ftCode != null" >
+        #{ftCode,jdbcType=VARCHAR},
+      </if>
+      <if test="ftDate != null" >
+        #{ftDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ftRecorderid != null" >
+        #{ftRecorderid,jdbcType=INTEGER},
+      </if>
+      <if test="ftRecorder != null" >
+        #{ftRecorder,jdbcType=VARCHAR},
+      </if>
+      <if test="ftRecorddate != null" >
+        #{ftRecorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ftStatus != null" >
+        #{ftStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="ftStatuscode != null" >
+        #{ftStatuscode,jdbcType=VARCHAR},
+      </if>
+      <if test="ftRemark != null" >
+        #{ftRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ftText1 != null" >
+        #{ftText1,jdbcType=VARCHAR},
+      </if>
+      <if test="ftText2 != null" >
+        #{ftText2,jdbcType=VARCHAR},
+      </if>
+      <if test="ftText3 != null" >
+        #{ftText3,jdbcType=VARCHAR},
+      </if>
+      <if test="ftText4 != null" >
+        #{ftText4,jdbcType=VARCHAR},
+      </if>
+      <if test="ftText5 != null" >
+        #{ftText5,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
+    update fundtransfer
+    <set >
+      <if test="ftCode != null" >
+        ft_code = #{ftCode,jdbcType=VARCHAR},
+      </if>
+      <if test="ftDate != null" >
+        ft_date = #{ftDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ftRecorderid != null" >
+        ft_recorderid = #{ftRecorderid,jdbcType=INTEGER},
+      </if>
+      <if test="ftRecorder != null" >
+        ft_recorder = #{ftRecorder,jdbcType=VARCHAR},
+      </if>
+      <if test="ftRecorddate != null" >
+        ft_recorddate = #{ftRecorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ftStatus != null" >
+        ft_status = #{ftStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="ftStatuscode != null" >
+        ft_statuscode = #{ftStatuscode,jdbcType=VARCHAR},
+      </if>
+      <if test="ftRemark != null" >
+        ft_remark = #{ftRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        companyid = #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        updaterId = #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ftText1 != null" >
+        ft_text1 = #{ftText1,jdbcType=VARCHAR},
+      </if>
+      <if test="ftText2 != null" >
+        ft_text2 = #{ftText2,jdbcType=VARCHAR},
+      </if>
+      <if test="ftText3 != null" >
+        ft_text3 = #{ftText3,jdbcType=VARCHAR},
+      </if>
+      <if test="ftText4 != null" >
+        ft_text4 = #{ftText4,jdbcType=VARCHAR},
+      </if>
+      <if test="ftText5 != null" >
+        ft_text5 = #{ftText5,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ft_id = #{ftId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
+    update fundtransfer
+    set ft_code = #{ftCode,jdbcType=VARCHAR},
+      ft_date = #{ftDate,jdbcType=TIMESTAMP},
+      ft_recorderid = #{ftRecorderid,jdbcType=INTEGER},
+      ft_recorder = #{ftRecorder,jdbcType=VARCHAR},
+      ft_recorddate = #{ftRecorddate,jdbcType=TIMESTAMP},
+      ft_status = #{ftStatus,jdbcType=VARCHAR},
+      ft_statuscode = #{ftStatuscode,jdbcType=VARCHAR},
+      ft_remark = #{ftRemark,jdbcType=VARCHAR},
+      companyid = #{companyid,jdbcType=INTEGER},
+      updaterId = #{updaterid,jdbcType=INTEGER},
+      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      ft_text1 = #{ftText1,jdbcType=VARCHAR},
+      ft_text2 = #{ftText2,jdbcType=VARCHAR},
+      ft_text3 = #{ftText3,jdbcType=VARCHAR},
+      ft_text4 = #{ftText4,jdbcType=VARCHAR},
+      ft_text5 = #{ftText5,jdbcType=VARCHAR}
+    where ft_id = #{ftId,jdbcType=INTEGER}
+  </update>
+</mapper>

applications/money/money-server/src/main/resources/mapper/FundtransferdetailMapper.xml

@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.FundtransferdetailMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Fundtransferdetail" >
+    <id column="ftd_id" property="ftdId" jdbcType="INTEGER" />
+    <result column="ftd_ftid" property="ftdFtid" jdbcType="INTEGER" />
+    <result column="ftd_detno" property="ftdDetno" jdbcType="INTEGER" />
+    <result column="ftd_ym" property="ftdYm" jdbcType="INTEGER" />
+    <result column="ftd_bankid" property="ftdBankid" jdbcType="INTEGER" />
+    <result column="ftd_bankcode" property="ftdBankcode" jdbcType="VARCHAR" />
+    <result column="ftd_bankname" property="ftdBankname" jdbcType="VARCHAR" />
+    <result column="ftd_inbankid" property="ftdInbankid" jdbcType="INTEGER" />
+    <result column="ftd_inbankcode" property="ftdInbankcode" jdbcType="VARCHAR" />
+    <result column="ftd_inbankname" property="ftdInbankname" jdbcType="VARCHAR" />
+    <result column="ftd_nowbalance" property="ftdNowbalance" jdbcType="DOUBLE" />
+    <result column="ftd_paymethod" property="ftdPaymethod" jdbcType="VARCHAR" />
+    <result column="ftd_paycode" property="ftdPaycode" jdbcType="VARCHAR" />
+    <result column="ftd_remark" property="ftdRemark" jdbcType="VARCHAR" />
+    <result column="companyid" property="companyid" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="ftd_text1" property="ftdText1" jdbcType="VARCHAR" />
+    <result column="ftd_text2" property="ftdText2" jdbcType="VARCHAR" />
+    <result column="ftd_text3" property="ftdText3" jdbcType="VARCHAR" />
+    <result column="ftd_text4" property="ftdText4" jdbcType="VARCHAR" />
+    <result column="ftd_text5" property="ftdText5" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    ftd_id, ftd_ftid, ftd_detno, ftd_ym, ftd_bankid, ftd_bankcode, ftd_bankname, ftd_inbankid, 
+    ftd_inbankcode, ftd_inbankname, ftd_nowbalance, ftd_paymethod, ftd_paycode, ftd_remark, 
+    companyid, updaterId, updatedate, ftd_text1, ftd_text2, ftd_text3, ftd_text4, ftd_text5
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from fundtransferdetail
+    where ftd_id = #{ftdId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from fundtransferdetail
+    where ftd_id = #{ftdId,jdbcType=INTEGER}
+  </delete>
+
+  <delete id="deleteItem" parameterType="java.lang.Integer" >
+    delete from fundtransferdetail
+    where ftd_ftid = #{ftdFtid,jdbcType=INTEGER}
+  </delete>
+
+  <insert id="insert" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
+    insert into fundtransferdetail (ftd_id, ftd_ftid, ftd_detno, 
+      ftd_ym, ftd_bankid, ftd_bankcode, 
+      ftd_bankname, ftd_inbankid, ftd_inbankcode, 
+      ftd_inbankname, ftd_nowbalance, ftd_paymethod, 
+      ftd_paycode, ftd_remark, companyid, 
+      updaterId, updatedate, ftd_text1, 
+      ftd_text2, ftd_text3, ftd_text4, 
+      ftd_text5)
+    values (#{ftdId,jdbcType=INTEGER}, #{ftdFtid,jdbcType=INTEGER}, #{ftdDetno,jdbcType=INTEGER}, 
+      #{ftdYm,jdbcType=INTEGER}, #{ftdBankid,jdbcType=INTEGER}, #{ftdBankcode,jdbcType=VARCHAR}, 
+      #{ftdBankname,jdbcType=VARCHAR}, #{ftdInbankid,jdbcType=INTEGER}, #{ftdInbankcode,jdbcType=VARCHAR}, 
+      #{ftdInbankname,jdbcType=VARCHAR}, #{ftdNowbalance,jdbcType=DOUBLE}, #{ftdPaymethod,jdbcType=VARCHAR}, 
+      #{ftdPaycode,jdbcType=VARCHAR}, #{ftdRemark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
+      #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{ftdText1,jdbcType=VARCHAR}, 
+      #{ftdText2,jdbcType=VARCHAR}, #{ftdText3,jdbcType=VARCHAR}, #{ftdText4,jdbcType=VARCHAR}, 
+      #{ftdText5,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
+    insert into fundtransferdetail
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="ftdId != null" >
+        ftd_id,
+      </if>
+      <if test="ftdFtid != null" >
+        ftd_ftid,
+      </if>
+      <if test="ftdDetno != null" >
+        ftd_detno,
+      </if>
+      <if test="ftdYm != null" >
+        ftd_ym,
+      </if>
+      <if test="ftdBankid != null" >
+        ftd_bankid,
+      </if>
+      <if test="ftdBankcode != null" >
+        ftd_bankcode,
+      </if>
+      <if test="ftdBankname != null" >
+        ftd_bankname,
+      </if>
+      <if test="ftdInbankid != null" >
+        ftd_inbankid,
+      </if>
+      <if test="ftdInbankcode != null" >
+        ftd_inbankcode,
+      </if>
+      <if test="ftdInbankname != null" >
+        ftd_inbankname,
+      </if>
+      <if test="ftdNowbalance != null" >
+        ftd_nowbalance,
+      </if>
+      <if test="ftdPaymethod != null" >
+        ftd_paymethod,
+      </if>
+      <if test="ftdPaycode != null" >
+        ftd_paycode,
+      </if>
+      <if test="ftdRemark != null" >
+        ftd_remark,
+      </if>
+      <if test="companyid != null" >
+        companyid,
+      </if>
+      <if test="updaterid != null" >
+        updaterId,
+      </if>
+      <if test="updatedate != null" >
+        updatedate,
+      </if>
+      <if test="ftdText1 != null" >
+        ftd_text1,
+      </if>
+      <if test="ftdText2 != null" >
+        ftd_text2,
+      </if>
+      <if test="ftdText3 != null" >
+        ftd_text3,
+      </if>
+      <if test="ftdText4 != null" >
+        ftd_text4,
+      </if>
+      <if test="ftdText5 != null" >
+        ftd_text5,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="ftdId != null" >
+        #{ftdId,jdbcType=INTEGER},
+      </if>
+      <if test="ftdFtid != null" >
+        #{ftdFtid,jdbcType=INTEGER},
+      </if>
+      <if test="ftdDetno != null" >
+        #{ftdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="ftdYm != null" >
+        #{ftdYm,jdbcType=INTEGER},
+      </if>
+      <if test="ftdBankid != null" >
+        #{ftdBankid,jdbcType=INTEGER},
+      </if>
+      <if test="ftdBankcode != null" >
+        #{ftdBankcode,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdBankname != null" >
+        #{ftdBankname,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdInbankid != null" >
+        #{ftdInbankid,jdbcType=INTEGER},
+      </if>
+      <if test="ftdInbankcode != null" >
+        #{ftdInbankcode,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdInbankname != null" >
+        #{ftdInbankname,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdNowbalance != null" >
+        #{ftdNowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="ftdPaymethod != null" >
+        #{ftdPaymethod,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdPaycode != null" >
+        #{ftdPaycode,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdRemark != null" >
+        #{ftdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ftdText1 != null" >
+        #{ftdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdText2 != null" >
+        #{ftdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdText3 != null" >
+        #{ftdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdText4 != null" >
+        #{ftdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdText5 != null" >
+        #{ftdText5,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
+    update fundtransferdetail
+    <set >
+      <if test="ftdFtid != null" >
+        ftd_ftid = #{ftdFtid,jdbcType=INTEGER},
+      </if>
+      <if test="ftdDetno != null" >
+        ftd_detno = #{ftdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="ftdYm != null" >
+        ftd_ym = #{ftdYm,jdbcType=INTEGER},
+      </if>
+      <if test="ftdBankid != null" >
+        ftd_bankid = #{ftdBankid,jdbcType=INTEGER},
+      </if>
+      <if test="ftdBankcode != null" >
+        ftd_bankcode = #{ftdBankcode,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdBankname != null" >
+        ftd_bankname = #{ftdBankname,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdInbankid != null" >
+        ftd_inbankid = #{ftdInbankid,jdbcType=INTEGER},
+      </if>
+      <if test="ftdInbankcode != null" >
+        ftd_inbankcode = #{ftdInbankcode,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdInbankname != null" >
+        ftd_inbankname = #{ftdInbankname,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdNowbalance != null" >
+        ftd_nowbalance = #{ftdNowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="ftdPaymethod != null" >
+        ftd_paymethod = #{ftdPaymethod,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdPaycode != null" >
+        ftd_paycode = #{ftdPaycode,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdRemark != null" >
+        ftd_remark = #{ftdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        companyid = #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        updaterId = #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ftdText1 != null" >
+        ftd_text1 = #{ftdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdText2 != null" >
+        ftd_text2 = #{ftdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdText3 != null" >
+        ftd_text3 = #{ftdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdText4 != null" >
+        ftd_text4 = #{ftdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="ftdText5 != null" >
+        ftd_text5 = #{ftdText5,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ftd_id = #{ftdId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
+    update fundtransferdetail
+    set ftd_ftid = #{ftdFtid,jdbcType=INTEGER},
+      ftd_detno = #{ftdDetno,jdbcType=INTEGER},
+      ftd_ym = #{ftdYm,jdbcType=INTEGER},
+      ftd_bankid = #{ftdBankid,jdbcType=INTEGER},
+      ftd_bankcode = #{ftdBankcode,jdbcType=VARCHAR},
+      ftd_bankname = #{ftdBankname,jdbcType=VARCHAR},
+      ftd_inbankid = #{ftdInbankid,jdbcType=INTEGER},
+      ftd_inbankcode = #{ftdInbankcode,jdbcType=VARCHAR},
+      ftd_inbankname = #{ftdInbankname,jdbcType=VARCHAR},
+      ftd_nowbalance = #{ftdNowbalance,jdbcType=DOUBLE},
+      ftd_paymethod = #{ftdPaymethod,jdbcType=VARCHAR},
+      ftd_paycode = #{ftdPaycode,jdbcType=VARCHAR},
+      ftd_remark = #{ftdRemark,jdbcType=VARCHAR},
+      companyid = #{companyid,jdbcType=INTEGER},
+      updaterId = #{updaterid,jdbcType=INTEGER},
+      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      ftd_text1 = #{ftdText1,jdbcType=VARCHAR},
+      ftd_text2 = #{ftdText2,jdbcType=VARCHAR},
+      ftd_text3 = #{ftdText3,jdbcType=VARCHAR},
+      ftd_text4 = #{ftdText4,jdbcType=VARCHAR},
+      ftd_text5 = #{ftdText5,jdbcType=VARCHAR}
+    where ftd_id = #{ftdId,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -29,13 +29,15 @@ Ext.define('saas.util.BaseUtil', {
                     if(res.success) {
                         return resolve(response);
                     }else {
+                        Ext.toast(res.message || '请求错误');
                         console.error('server request failure with code ' + res.code + '.');
                         console.error('failure message: ' + res.message);
                         return reject(response);
                     }
                 },
                 failure: function (response, opts) {
-                    console.error('server-side failure with status code ' + response.status);
+                    Ext.toast('请求错误');
+                    console.error('server-side failure with status code ' + response);
                     return reject(response);
                 }
             });

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

@@ -13,43 +13,76 @@ Ext.define('saas.view.core.query.MoreQueryWin', {
     constrain: true,
     closable: true,
     layout: 'fit',
+    items: [{
+        xtype: 'form',
+        layout: 'column',
+        autoScroll: true,
+        buttonAlign : 'center',
+        bodyPadding: 5,
+        //frame:true,
+        defaults: {
+            xtype:'textfield',
+            margin: '0 5 5 0',
+            labelAlign: 'right',
+            labelWidth: 90,
+            columnWidth: 0.5,
+            blankText: '该字段不能为空'
+        },
+        // items:me.queryItems,
+        buttons: [{
+           text:'重置',
+           handler:'onReSetClick'
+        },'->',{
+            text: '查询',
+            handler:'onMoreQuery'
+        }, {
+            text: '关闭',
+            handler:'onCloseClick'
+        }]
+    }],
     initComponent:function(){
         var me=this;
-        Ext.apply(me,{
-            items:me.setFormItems()
-        });
+        me.setFormItems();
         me.callParent();
     },
     setFormItems:function() {
-        var me = this;
-        var form = {
-            xtype: 'form',
-            layout: 'column',
-            autoScroll: true,
-            buttonAlign : 'center',
-            bodyPadding: 5,
-            //frame:true,
-            defaults: {
-                xtype:'textfield',
-                margin: '0 5 5 0',
-                labelAlign: 'right',
-                labelWidth: 90,
-                columnWidth: 0.5,
-                blankText: '该字段不能为空'
-            },
-            items:me.queryItems,
-            buttons: [{
-               text:'重置',
-               handler:'onReSetClick'
-            },'->',{
-                text: '查询',
-                handler:'onMoreQuery'
-            }, {
-                text: '关闭',
-                handler:'onCloseClick'
-            }]
-        };
-        return form ;
-    },
+        var me = this,
+        queryViewModel = me.queryViewModel,
+        form = me.items[0],
+        items = me.queryItems;
+
+        Ext.Array.each(items, function(item) {
+            var bind = item.bind,
+            name = item.name,
+            ignore = item.ignore,
+            defaultValue = item.defaultValue;
+            
+            // 设置model绑定
+            if(!ignore) {
+                if(bind) {
+                    if(!Ext.isString(bind)) {
+                        bind = name;
+                        Ext.apply(bind, {
+                            value: '{moreForm.' + bind + '}'
+                        });
+                    }else {
+                        bind = name;
+                        item.bind = '{moreForm.' + bind + '}';
+                    }
+                }else {
+                    bind = name;
+                    item.bind = '{moreForm.' + bind + '}';
+                }
+                // 设置默认值
+                if(defaultValue) {
+                    queryViewModel.set('moreForm.' + bind, defaultValue);
+                }
+            }
+        });
+
+        Ext.apply(form, {
+            items: items
+        });
+    }
 
 });

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

@@ -52,7 +52,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 listeners: {
                     beforeload: function (store, op) {
                         var queryPanel = me.up('core-query-querypanel'),
-                        condition = queryPanel.getConditions(),
+                        viewModel = queryPanel.getViewModel(),
+                        moreQuery = viewModel.get('moreQuery'),
+                        condition = queryPanel.getConditions(moreQuery),
                         defaultCondition = me.defaultCondition,
                         mode = queryPanel.getQueryMode();
 
@@ -70,8 +72,15 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                         });
     
                     },
-                    requestexception: function() {
-                        debugger;
+                    load: function(store, records, successful, operation, eOpts) {
+                        var queryPanel = me.up('core-query-querypanel'),
+                        mode = queryPanel.getQueryMode();
+                        
+                        if(mode=="MAIN"){
+                            me.reconfigure(store, me.baseColumn);
+                        }else{
+                            me.reconfigure(store, me.relativeColumn);
+                        }
                     }
                 }
             }),

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

@@ -57,10 +57,6 @@ Ext.define('saas.view.core.query.QueryPanel', {
             ignore = item.ignore,
             defaultValue = item.defaultValue;
 
-            if(!item.columnWidth){
-                item.columnWidth = 0.25;
-            }
-
             // 设置model绑定
             if(!ignore) {
                 if(bind) {
@@ -97,46 +93,83 @@ Ext.define('saas.view.core.query.QueryPanel', {
     /**
      * 获得过滤条件
      */
-    getConditions: function() {
+    getConditions: function(moreQuery) {
         var me = this,
         formItems = me.queryFormItems,
+        moreQueryFormItems = me.moreQueryFormItems,
         viewModel = me.getViewModel(),
         viewModelData = viewModel.getData(),
         bindItems = viewModelData['form'],
+        moreItems = viewModelData['moreForm'],
         condition,
         conditions = [];
 
-        for(k in bindItems) {
-            var item = Ext.Array.findBy(formItems, function(i) {
-                return i.name == k;
-            });
-            var field = item.name,
-            func = item.getCondition,
-            value = bindItems[k],
-            condition;
-
-            if(typeof func == 'function') {
-                condition = {
-                    type: 'condition',
-                    value: func(value)
-                }
-            }else {
-                var xtype = item.xtype || 'textfield',
-                type = item.fieldType || me.getDefaultFieldType(xtype),
-                operation = item.operation || me.getDefaultFieldOperation(xtype),
-                conditionValue = me.getConditionValue(xtype, value);
+        if(moreQuery) {
+            for(k in moreItems) {
+                var item = Ext.Array.findBy(moreQueryFormItems, function(i) {
+                    return i.name == k;
+                });
+                var field = item.name,
+                func = item.getCondition,
+                value = moreItems[k],
+                condition;
     
-                if(!conditionValue) {
-                    continue;
+                if(typeof func == 'function') {
+                    condition = {
+                        type: 'condition',
+                        value: func(value)
+                    }
+                }else {
+                    var xtype = item.xtype || 'textfield',
+                    type = item.fieldType || me.getDefaultFieldType(xtype),
+                    operation = item.operation || me.getDefaultFieldOperation(xtype),
+                    conditionValue = me.getConditionValue(xtype, value);
+        
+                    if(!conditionValue) {
+                        continue;
+                    }
+                    condition = {
+                        type: type,
+                        field: field,
+                        operation: operation,
+                        value: conditionValue
+                    }
                 }
-                condition = {
-                    type: type,
-                    field: field,
-                    operation: operation,
-                    value: conditionValue
+                conditions.push(condition);
+            }
+        }else {
+            for(k in bindItems) {
+                var item = Ext.Array.findBy(formItems, function(i) {
+                    return i.name == k;
+                });
+                var field = item.name,
+                func = item.getCondition,
+                value = bindItems[k],
+                condition;
+    
+                if(typeof func == 'function') {
+                    condition = {
+                        type: 'condition',
+                        value: func(value)
+                    }
+                }else {
+                    var xtype = item.xtype || 'textfield',
+                    type = item.fieldType || me.getDefaultFieldType(xtype),
+                    operation = item.operation || me.getDefaultFieldOperation(xtype),
+                    conditionValue = me.getConditionValue(xtype, value);
+        
+                    if(!conditionValue) {
+                        continue;
+                    }
+                    condition = {
+                        type: type,
+                        field: field,
+                        operation: operation,
+                        value: conditionValue
+                    }
                 }
+                conditions.push(condition);
             }
-            conditions.push(condition);
         }
 
         return conditions;

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

@@ -2,17 +2,34 @@ Ext.define('saas.view.core.query.QueryPanelController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.core-query-querypanel',
     moreQuery: function (btn) {
-        var me = this,view= me.getView();
+        var me = this,view= me.getView(),
+        viewModel = me.getViewModel();
         this.queryWin = view.add({
             xtype:'core-query-morequeryform',
-            queryItems: view.moreQueryFormItems
+            queryItems: view.moreQueryFormItems,
+            queryController: me,
+            queryPanel: view,
+            queryViewModel: viewModel
         });
         this.queryWin.show();
     },
     onQuery: function (btn) {
         var me = this,
         queryPanel = me.getView(),
+        viewModel = me.getViewModel(),
         queryGrid = queryPanel.down('core-query-querygridpanel');
+
+        viewModel.set('moreQuery', false);
+        queryGrid.store.loadPage(1);
+    },
+    onMoreQuery: function() {
+        var me = this,
+        queryPanel = me.getView(),
+        viewModel = me.getViewModel(),
+        queryGrid = queryPanel.down('core-query-querygridpanel');
+
+        me.queryWin.hide();
+        viewModel.set('moreQuery', true);
         queryGrid.store.loadPage(1);
     },
     onReSetClick:function(btn){

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

@@ -30,26 +30,29 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         fieldLabel: 'id'
     }, {
         xtype: 'hidden',
-        name: 'custid',
+        name: 'rb_custid',
         fieldLabel: '客户ID'
     }, {
         xtype: 'hidden',
-        name: 'custcode',
+        name: 'rb_custcode',
         fieldLabel: '客户编号'
     }, {
         xtype: "dbfindtrigger",
         name: "rb_custname",
-        fieldLabel: "客户名称"
+        fieldLabel: "客户名称",
+        dataUrl: '',
     }, {
         xtype: "numberfield",
         name: "rb_rbdamount",
+        readOnly: true,
+        editable: false,
         fieldLabel: "总欠款"
     }, {
         xtype: "datefield",
         name: "rb_date",
         fieldLabel: "日期"
     }, {
-        xtype: "dbfindtrigger",
+        xtype: "textfield",
         name: "rb_manname",
         fieldLabel: "收款人"
     }, {

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

@@ -5,29 +5,37 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            /**放大镜新增demo*/
-            "field[name=combo]":{
-                beforerender:function(f){
-                    f.addHandler=me.addCombo;
-                }
-            },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendcode]':{
+            'dbfindtrigger[name=rb_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.0.181:8570/api/document/vendor/getVendorsByCondition',
+                        //数据接口
+                        dataUrl: 'http://192.168.253.41:9480/vendor/getVendorsByCondition',
+                        //赋值 
                         dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
+                            from: 've_id', to: 'rb_custid'
+                        }, {
+                            from:'ve_code', to:'rb_custcode'
                         },{
-                            from:'ve_name',to:'pu_vendname'
+                            from:'ve_name', to:'rb_custname'
                         }],
+                        //联想设置
                         dbtpls:[{
                             field:'ve_code',width:100
                         },{
                             field:'ve_name',width:100
                         }],
+                        //联想查询条件
+                        dbCondition:"CONCAT(ve_code, ve_name) like '{0}%'",
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            xtype : "textfield", 
+                            name : "ve_name", 
+                            conditionExpression:"ve_name like '{0}%'",//传入后台条件  替换占位符
+                            fieldLabel : "供应商名称", 
+                            columnWidth : 0.25
+                        }],
+                        //放大镜窗口列表
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "flex": 0,
                             "dataIndex": "ve_id",
@@ -35,7 +43,6 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "xtype": "",
                             "items": null
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
@@ -43,14 +50,12 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "xtype": "",
                             "items": null
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
                             "xtype": "",
                             "items": null
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
@@ -62,52 +67,6 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
 
                 }
             },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        conditionCode:'pr_code',
-                        dataUrl:'http://192.168.0.181:8570/api/document/product/getProductsByCondition',
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
-                        }],
-                        dbtpls:[{
-                            field:'pr_code',width:100
-                        },{
-                            field:'pr_detail',width:100
-                        }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
-                    }) ;   
-
-                }
-            }
         });
 
     },

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

@@ -87,17 +87,14 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     moreQueryFormItems: [{
         xtype: 'textfield',
         name: 'pu_buyername',
-        bind: '{pu_buyername}',
         fieldLabel: '采购员'
     }, {
         xtype: 'textfield',
         name: 'pu_total',
-        bind: '{pu_total}',
         fieldLabel: '金额'
     }, {
         xtype: 'condatefield',
         name: 'pu_delivery',
-        bind: '{pu_delivery}',
         fieldLabel: '交货日期',
         columnWidth: 1
     }],
@@ -109,10 +106,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         defaultCondition:'',
         baseVastUrl: basePath+'purchase/purchase/',
         baseColumn: [{
-            text: '序号',
-            width: 80,
-            xtype: 'rownumberer'
-        }, {
             text: 'id',
             dataIndex: 'pu_id',
             width: 100,
@@ -147,10 +140,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             flex: 1
         }],
         relativeColumn: [{
-            text: '序号',
-            width: 80,
-            xtype: 'rownumberer'
-        }, {
             text: 'id',
             dataIndex: 'pu_id',
             width: 100,