Browse Source

银行接口,保证金明细

dzxiii 3 months ago
parent
commit
8164d09821

+ 95 - 15
ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankDepositController.java

@@ -3,18 +3,23 @@ package com.ruoyi.mast.bank.controller;
 import java.math.BigDecimal;
 import java.util.List;
 import java.io.IOException;
+import java.util.Map;
 import java.util.Random;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
+import com.ruoyi.mast.bank.domain.BankDepositdesc;
 import com.ruoyi.mast.bank.domain.BankTenderpub;
+import com.ruoyi.mast.bank.domain.BankTenderquery;
+import com.ruoyi.mast.bank.service.IBankDepositdescService;
 import com.ruoyi.mast.bank.utils.JsonUtils;
 import com.ruoyi.system.api.RemotePlanService;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -46,7 +51,13 @@ public class BankDepositController extends BaseController {
     private IBankDepositService bankDepositService;
 
     @Autowired
-    private RemotePlanService remotePlanService;
+    private IBankDepositdescService bankDepositdescService;
+
+    @Autowired
+    private BankTenderpubController bankTenderpubController;
+
+    @Autowired
+    private BankDepositdescController bankDepositdescController;
 
     @Autowired
     private Environment env;
@@ -75,12 +86,77 @@ public class BankDepositController extends BaseController {
     }
 
     /**
-     * 获取查询保证金入账数量详细信息
+     * 获取查询保证金入账数量详细信息 by 采购公告id
+     * depositid : 当作ppid 用
      */
+    @Transactional
     @RequiresPermissions("bank:deposit:query")
     @GetMapping(value = "/{depositid}")
     public AjaxResult getInfo(@PathVariable("depositid") String depositid) {
-        return success(bankDepositService.selectBankDepositByDepositid(depositid));
+        Map<String, Object> map = bankTenderpubController.getInfos(depositid);
+        if (map.size() < 2) return AjaxResult.error("请检查标段发布和标段查询请求数据是否成功!");
+        BankTenderpub bt = map.get("tenderpub") == null ? null : (BankTenderpub) map.get("tenderpub");
+        BankTenderquery bq = map.get("tenderquery") == null ? null : (BankTenderquery) map.get("tenderquery");
+        if (bt == null) return AjaxResult.error("标段发布数据异常,请检查!");
+        if (bq == null) return AjaxResult.error("标段信息查询数据异常,请检查!");
+
+        BankDeposit bankDeposit = new BankDeposit();
+        bankDeposit.setPpid(bq.getPpid());
+        List<BankDeposit> list = bankDepositService.selectBankDepositList(bankDeposit);
+        if (!list.isEmpty()) {
+            for (BankDeposit bd : list) {
+                bankDepositService.deleteBankDepositByDepositid(bd.getDepositid());
+            }
+        }
+
+        bankDeposit.setSgtid(bq.getRtnSgtid());
+        bankDeposit.setSgtno(bq.getRtnSgtno());
+        bankDeposit.setPrjno(bq.getRtnPrjno());
+        bankDeposit.setPltfmcstno(env.getProperty("BANK.PLTFMCSTNO"));
+        bankDeposit.setEntpnm("");
+
+        AjaxResult msg1 = addBankDeposit(bankDeposit);
+
+        BankDeposit tempDeposit = new BankDeposit();
+        tempDeposit.setPpid(bq.getPpid());
+        List<BankDeposit> tempList = bankDepositService.selectBankDepositList(tempDeposit);
+        if (tempList.isEmpty()) return AjaxResult.error("查询银行返回标段保证金入账数量错误!");
+        if (tempList.get(0).getRtnTdrnum() == null)
+            return AjaxResult.error("银行返回标段保证金入账数量错误!");
+        int pgno = Integer.parseInt(tempList.get(0).getRtnTdrnum().toString());
+        int page = pgno / 20;
+        int page1 = pgno % 20;
+        if (page1 > 0) page += 1;
+
+        BankDepositdesc bankDepositdesc = new BankDepositdesc();
+        bankDepositdesc.setPpid(bq.getPpid());
+        List<BankDepositdesc> blist = bankDepositdescService.selectBankDepositdescList(bankDepositdesc);
+        if (!blist.isEmpty()) {
+            for (BankDepositdesc bdd : blist) {
+                bankDepositdescService.deleteBankDepositdescByDepositdescid(bdd.getDepositdescid());
+            }
+        }
+
+        bankDepositdesc.setSgtid(bq.getRtnSgtid());
+        bankDepositdesc.setSgtno(bq.getRtnSgtno());
+        bankDepositdesc.setPrjno(bq.getRtnPrjno());
+        bankDepositdesc.setPltfmcstno(env.getProperty("BANK.PLTFMCSTNO"));
+        bankDepositdesc.setEntpnm("");
+
+        for (int i = page1; i <= page; i++) {
+            bankDepositdesc.setPgno(String.valueOf(i));
+            AjaxResult msg2 = bankDepositdescController.addBankDepositdesc(bankDepositdesc);
+
+            if (!msg2.get("msg").toString().contains("成功")) {
+                return AjaxResult.error("保证金入账明细:" + msg2.get("msg").toString());
+            }
+        }
+
+        if (msg1.get("msg").toString().contains("成功")) {
+            return AjaxResult.success("银行接口请求成功!");
+        } else {
+            return AjaxResult.error("保证金入账数量:" + msg1.get("msg").toString());
+        }
     }
 
     /**
@@ -90,27 +166,31 @@ public class BankDepositController extends BaseController {
     @Log(title = "查询保证金入账数量", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankDeposit bankDeposit) {
-        BankDeposit bd = new BankDeposit();
+        return addBankDeposit(bankDeposit);
+    }
+
+
+    public AjaxResult addBankDeposit(BankDeposit bankDeposit) {
         // 流水号
         String TRNUID = "BZJN" + System.currentTimeMillis() + (new Random().nextInt(1000) + 1);
 
-        bd.setDepositid(UUID.randomUUID().toString(true));
-        bd.setTrnuid(TRNUID);
-        bd.setPpid(Long.valueOf(115));
-        bd.setSgtid("0cd87fb3e9314f43a0e7240380a30cec");
-        bd.setSgtno("BD202408281514");
-        bd.setPrjno("32143217891");
-        bd.setPltfmcstno("1100709753");
-        bd.setEntpnm("");
+        bankDeposit.setDepositid(UUID.randomUUID().toString(true));
+        bankDeposit.setTrnuid(TRNUID);
+//        bankDeposit.setPpid(Long.valueOf(115));
+//        bankDeposit.setSgtid("0cd87fb3e9314f43a0e7240380a30cec");
+//        bankDeposit.setSgtno("BD202408281514");
+//        bankDeposit.setPrjno("32143217891");
+//        bankDeposit.setPltfmcstno("1100709753");
+//        bankDeposit.setEntpnm("");
 
 
-        String rtnxml = postBank(bd);
+        String rtnxml = postBank(bankDeposit);
 
         String rtn = JsonUtils.getStatus(rtnxml);
 
         if (rtn.contains("成功")) {
-            bankDepositService.insertBankDeposit(bd);
-            update(bd, rtnxml);
+            bankDepositService.insertBankDeposit(bankDeposit);
+            update(bankDeposit, rtnxml);
             return AjaxResult.success(rtn);
         } else return AjaxResult.error(rtn);
     }

+ 75 - 42
ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankDepositdescController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.mast.bank.controller;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 import javax.servlet.http.HttpServletResponse;
@@ -10,8 +11,11 @@ import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.mast.bank.utils.JsonUtils;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
+import org.apache.poi.hpsf.Decimal;
+import org.json.XML;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -74,6 +78,7 @@ public class BankDepositdescController extends BaseController {
     @RequiresPermissions("bank:depositdesc:query")
     @GetMapping(value = "/{depositdescid}")
     public AjaxResult getInfo(@PathVariable("depositdescid") String depositdescid) {
+
         return success(bankDepositdescService.selectBankDepositdescByDepositdescid(depositdescid));
     }
 
@@ -94,13 +99,13 @@ public class BankDepositdescController extends BaseController {
         bdd.setDepositdescid(UUID.randomUUID().toString(true));
         bdd.setTrnuid(TRNUID);
 
-        bdd.setPpid(Long.valueOf(115));
-        bdd.setSgtid("0cd87fb3e9314f43a0e7240380a30cec");
-        bdd.setSgtno("BD202408281514");
-        bdd.setPrjno("32143217891");
-        bdd.setPltfmcstno("1100709753");
-        bdd.setEntpnm("");
-        bdd.setPgno("1");
+//        bdd.setPpid(Long.valueOf(115));
+//        bdd.setSgtid("0cd87fb3e9314f43a0e7240380a30cec");
+//        bdd.setSgtno("BD202408281514");
+//        bdd.setPrjno("32143217891");
+//        bdd.setPltfmcstno("1100709753");
+//        bdd.setEntpnm("");
+//        bdd.setPgno("1");
 
         String rtnxml = postBank(bdd);
 
@@ -116,6 +121,7 @@ public class BankDepositdescController extends BaseController {
     /**
      * 修改查询保证金入账明细
      */
+    @Transactional
     @RequiresPermissions("bank:depositdesc:edit")
     @Log(title = "查询保证金入账明细", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -129,51 +135,78 @@ public class BankDepositdescController extends BaseController {
         return toAjax(update(bdd, rtnxml));
     }
 
-
-    private int update(BankDepositdesc bankDepositdesc, String rtnxml) {
+    @Transactional
+    public int update(BankDepositdesc bankDepositdesc, String rtnxml) {
 
         List<BankDepositdesc> list = bankDepositdescService.selectBankDepositdescList(bankDepositdesc);
         if (list.isEmpty()) return 0;
         BankDepositdesc bd = list.get(0);
+        String delid = bd.getDepositdescid();
 
         bd.setRtnTrnuid(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/TRNUID"));
         bd.setRtnStatus(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/STATUS"));
         bd.setRtnCode(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/STATUS/CODE"));
         bd.setRtnSeverity(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/STATUS/SEVERITY"));
         bd.setRtnMessage(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/STATUS/MESSAGE"));
-        bd.setRtnRcrdtotnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/RCRDTOTNUM"));
-        bd.setRtnCrnpgno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CRNPGNO"));
-        bd.setRtnPgrcrdnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/PGRCRDNUM"));
-        bd.setRtnTotpgnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/TOTPGNUM"));
-        bd.setRtnContent(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT"));
-        bd.setRtnLescstno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/LESCSTNO"));
-        bd.setRtnTdrno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/TDRNO"));
-        bd.setRtnCstno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/CSTNO"));
-        bd.setRtnPrjno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/PRJNO"));
-        bd.setRtnPrjnm(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/PRJNM"));
-        bd.setRtnSgtno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/SGTNO"));
-        bd.setRtnSgtnm(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/SGTNM"));
-        bd.setRtnSgtst(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/SGTST"));
-        bd.setRtnMrgnst(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/MRGNST"));
-        bd.setRtnTdracctno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/TDRACCTNO"));
-        bd.setRtnTdracctnoccycd(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/TDRACCTNOCCYCD"));
-        bd.setRtnTdracctnm(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/TDRACCTNM"));
-        bd.setRtnTdracctnobnkno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/TDRACCTNOBNKNO"));
-        bd.setRtnTdracctnobnknm(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/TDRACCTNOBNKNM"));
-        bd.setRtnTdrnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/TDRNUM"));
-        bd.setRtnMrgnamt(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/ MRGNAMT")));
-        bd.setRtnTdramt(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/TDRAMT")));
-        bd.setRtnAgncsvcfee(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/AGNCSVCFEE")));
-        bd.setRtnFrzamt(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/FRZAMT")));
-        bd.setRtnFineamt(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/FINEAMT")));
-        bd.setRtnTdrdt(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/TDRDT"));
-        bd.setRtnTdrtm(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/TDRTM"));
-        bd.setRtnDuetp(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/DUETP"));
-        bd.setRtnMbrshpno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/MBRSHPNO"));
-        bd.setRtnSvcfee(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/SVCFEE")));
-        bd.setRtnRemark(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CONTENT/REMARK"));
-
-        return bankDepositdescService.updateBankDepositdesc(bd);
+
+        bd.setRtnRcrdtotnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/RCRDTOTNUM"));        //记录总数
+        bd.setRtnCrnpgno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/CRNPGNO"));              //当前页码
+        bd.setRtnPgrcrdnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/PGRCRDNUM"));          //每页记录数
+        bd.setRtnTotpgnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY/TOTPGNUM"));            //总页数
+
+        String rsbody = JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINTRNRS/RSBODY");
+
+        bd.setRtnRsbody(rsbody);
+
+        bankDepositdescService.updateBankDepositdesc(bd);
+
+        ArrayList<String> contentlist = JsonUtils.findContent(rsbody);
+
+        for (int i = 0; i < contentlist.size(); i++) {
+
+            bd.setRtnLescstno(JsonUtils.findJson(contentlist.get(i), "LESCSTNO"));
+            bd.setRtnTdrno(JsonUtils.findJson(contentlist.get(i), "TDRNO"));
+            bd.setRtnCstno(JsonUtils.findJson(contentlist.get(i), "CSTNO"));
+            bd.setRtnPrjno(JsonUtils.findJson(contentlist.get(i), "PRJNO"));
+            bd.setRtnPrjnm(JsonUtils.findJson(contentlist.get(i), "PRJNM"));
+            bd.setRtnSgtno(JsonUtils.findJson(contentlist.get(i), "SGTNO"));
+            bd.setRtnSgtnm(JsonUtils.findJson(contentlist.get(i), "SGTNM"));
+
+            bd.setRtnSgtst(JsonUtils.findJson(contentlist.get(i), "SGTST"));        //投标状态0-未中标1-已中标
+            bd.setRtnMrgnst(JsonUtils.findJson(contentlist.get(i), "MRGNST"));      //保证金状态 1-竞标
+
+            bd.setRtnTdracctno(JsonUtils.findJson(contentlist.get(i), "TDRACCTNO"));
+            bd.setRtnTdracctnoccycd(JsonUtils.findJson(contentlist.get(i), "TDRACCTNOCCYCD"));
+            bd.setRtnTdracctnm(JsonUtils.findJson(contentlist.get(i), "TDRACCTNM"));
+            bd.setRtnTdracctnobnkno(JsonUtils.findJson(contentlist.get(i), "TDRACCTNOBNKNO"));
+            bd.setRtnTdracctnobnknm(JsonUtils.findJson(contentlist.get(i), "TDRACCTNOBNKNM"));
+            bd.setRtnTdrnum(JsonUtils.findJson(contentlist.get(i), "TDRNUM"));
+
+            bd.setRtnMrgnamt(JsonUtils.checkBigDecimal(JsonUtils.findJson(contentlist.get(i), " MRGNAMT")));
+
+            bd.setRtnTdramt(JsonUtils.checkBigDecimal(JsonUtils.findJson(contentlist.get(i), "TDRAMT")));
+
+            bd.setRtnAgncsvcfee(JsonUtils.checkBigDecimal(JsonUtils.findJson(contentlist.get(i), "AGNCSVCFEE")));      //代理服务费 double
+            bd.setRtnFrzamt(JsonUtils.checkBigDecimal(JsonUtils.findJson(contentlist.get(i), "FRZAMT")));
+            bd.setRtnFineamt(JsonUtils.checkBigDecimal(JsonUtils.findJson(contentlist.get(i), "FINEAMT")));
+            bd.setRtnTdrdt(JsonUtils.findJson(contentlist.get(i), "TDRDT"));
+            bd.setRtnTdrtm(JsonUtils.findJson(contentlist.get(i), "TDRTM"));
+            bd.setRtnDuetp(JsonUtils.findJson(contentlist.get(i), "DUETP"));        //缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函
+            bd.setRtnMbrshpno(JsonUtils.findJson(contentlist.get(i), "MBRSHPNO"));
+
+            //接口文档中存在项目
+            bd.setRtnSvcfee(JsonUtils.checkBigDecimal(JsonUtils.findJson(contentlist.get(i), "SVCFEE")));
+            bd.setRtnRemark(JsonUtils.findJson(contentlist.get(i), "REMARK"));
+
+            bd.setDepositdescid(UUID.randomUUID().toString(true));
+
+            bankDepositdescService.insertBankDepositdesc(bd);
+
+            if (i == (contentlist.size() - 1)) bankDepositdescService.deleteBankDepositdescByDepositdescid(delid);
+        }
+
+        if(contentlist.size()<1)return 0;
+        else return 1;
     }
 
     private String postBank(BankDepositdesc bankDepositdesc) {

+ 34 - 14
ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankTenderpubController.java

@@ -1,12 +1,16 @@
 package com.ruoyi.mast.bank.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.mast.bank.domain.BankDeposit;
+import com.ruoyi.mast.bank.domain.BankDepositdesc;
 import com.ruoyi.mast.bank.domain.BankTenderquery;
 import com.ruoyi.mast.bank.service.IBankTenderqueryService;
 import com.ruoyi.mast.bank.utils.JsonUtils;
@@ -47,10 +51,10 @@ public class BankTenderpubController extends BaseController {
     private IBankTenderpubService bankTenderpubService;
 
     @Autowired
-    private BankTenderqueryController bankTenderqueryController;
+    private IBankTenderqueryService bankTenderqueryService;
 
     @Autowired
-    private IBankTenderqueryService bankTenderqueryService;
+    private BankTenderqueryController bankTenderqueryController;
 
     @Autowired
     private RemotePlanService remotePlanService;
@@ -84,7 +88,7 @@ public class BankTenderpubController extends BaseController {
 
     @InnerAuth
     @GetMapping(value = "/getInfoInnerAuth/{tenderpubid}")
-    public AjaxResult getInfoInnerAuth(@PathVariable("id") String tenderpubid){
+    public AjaxResult getInfoInnerAuth(@PathVariable("id") String tenderpubid) {
         return getInfo(tenderpubid);
     }
 
@@ -97,8 +101,25 @@ public class BankTenderpubController extends BaseController {
         return success(bankTenderpubService.selectBankTenderpubByTenderpubid(tenderpubid));
     }
 
+    public Map<String, Object> getInfos(@PathVariable("ppid") String ppid) {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        BankTenderpub bankTenderpub = new BankTenderpub();
+        bankTenderpub.setPpid(Long.parseLong(ppid));
+        List<BankTenderpub> list1 = bankTenderpubService.selectBankTenderpubList(bankTenderpub);
+
+        BankTenderquery bankTenderquery = new BankTenderquery();
+        bankTenderquery.setPpid(Long.parseLong(ppid));
+        List<BankTenderquery> list2 = bankTenderqueryService.selectBankTenderqueryList(bankTenderquery);
+
+        map.put("tenderpub", list1.isEmpty() ? null : list1.get(0));
+        map.put("tenderquery", list2.isEmpty() ? null : list2.get(0));
+        return map;
+    }
+
     /**
      * 内部调用
+     *
      * @param bankTenderpub
      * @return
      */
@@ -138,28 +159,26 @@ public class BankTenderpubController extends BaseController {
 
         if (rtn.contains("成功")) {
             bankTenderpubService.insertBankTenderpub(bankTenderpub);
-            if(update(bankTenderpub, rtnxml)>0)
-            {
+            if (update(bankTenderpub, rtnxml) > 0) {
                 /** 同时查询保存标段查询信息 **/
                 BankTenderpub b = bankTenderpubService.selectBankTenderpubByTenderpubid(bankTenderpub.getTenderpubid());
                 BankTenderquery bt = new BankTenderquery();
                 bt.setPpid(Long.valueOf(bankTenderpub.getPpid()));
                 bt.setSgtid(b.getRtnSgtid());
                 AjaxResult msg = bankTenderqueryController.addBankTenderquery(bt);
-                if(msg.isSuccess()){
+                if (msg.isSuccess()) {
                     return success("调取银行接口成功");
-                }else{
+                } else {
                     return error("调取银行接口失败");
                 }
-            }
-            else
+            } else
                 return error("调取银行接口失败");
-        }
-        else return AjaxResult.error(rtn);
+        } else return AjaxResult.error(rtn);
     }
 
     /**
      * 内部调用
+     *
      * @param bankTenderpub
      * @return
      */
@@ -188,10 +207,10 @@ public class BankTenderpubController extends BaseController {
 
         if (rtn.contains("成功")) {
             return toAjax(update(bt, rtnxml));
-        }else if(rtn.contains("流水号TRNUID值已被使用")){
+        } else if (rtn.contains("流水号TRNUID值已被使用")) {
             // 调用标段信息查询,更新本条记录
             return error(rtn);
-        }else{
+        } else {
             return error(rtn);
         }
     }
@@ -275,13 +294,14 @@ public class BankTenderpubController extends BaseController {
 
     /**
      * 内部调用
+     *
      * @param ids
      * @return
      */
     @InnerAuth
     @Log(title = "标段发布", businessType = BusinessType.DELETE)
     @DeleteMapping("/removeInnerAuth/{ids}")
-    public AjaxResult removeInnerAuth(@PathVariable String[] ids){
+    public AjaxResult removeInnerAuth(@PathVariable String[] ids) {
         return remove(ids);
     }
 

+ 58 - 7
ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/utils/JsonUtils.java

@@ -1,12 +1,13 @@
 package com.ruoyi.mast.bank.utils;
 
+import org.json.JSONArray;
 import org.json.JSONObject;
 import org.json.XML;
 import org.xml.sax.InputSource;
 
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.StringReader;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -35,6 +36,12 @@ public class JsonUtils {
         return aq;
     }
 
+    public static String findJson(String json, String attrs) {
+        JSONObject object = new JSONObject(json);
+        String aq = JsonUtils.findJson(object, Convert(attrs));
+        return aq;
+    }
+
     /**
      * 遍历json
      *
@@ -61,20 +68,57 @@ public class JsonUtils {
         return "";
     }
 
+    /**
+     * 返回content数组
+     *
+     * @param json
+     * @return
+     */
+    public static ArrayList<String> findContent(String json) {
+        JSONObject object = checkJson(json);
+        if(object==null) return new ArrayList<>();
+        ArrayList<String> contents = new ArrayList<>();
+        if (!object.has("CONTENT")) return contents;
+
+        JSONArray arr = (JSONArray) object.get("CONTENT");
+
+        for (int i = 0; i < arr.length(); i++) {
+            contents.add(arr.get(i).toString());
+        }
+
+        return contents;
+    }
+
     /**
      * 检查是否为xml字符串
+     *
      * @param xml
      * @return
      */
-    public static boolean checkXml(String xml){
-        try{
+    public static boolean checkXml(String xml) {
+        try {
             DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(xml)));
             return true;
-        }catch (Exception e){
+        } catch (Exception e) {
             return false;
         }
     }
 
+    /**
+     * 检查是否是json字符串
+     *
+     * @param json
+     * @return
+     */
+    public static JSONObject checkJson(String json) {
+        try {
+            JSONObject object = new JSONObject(json);
+            return object;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     /**
      * 返回交易状态代码和结果
      *
@@ -83,7 +127,7 @@ public class JsonUtils {
      */
     public static String getStatus(String xml) {
 
-        if(!checkXml(xml)) return xml;
+        if (!checkXml(xml)) return xml;
         String A = JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/EXCEPTIONRS/STATUS/CODE");
         if (!"0".equals(A) && !"".equals(A))
             return JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/EXCEPTIONRS/STATUS/MESSAGE");
@@ -92,13 +136,20 @@ public class JsonUtils {
         if (!"0".equals(C) && !"".equals(C)) return JsonUtils.findXML(xml, "FOX/SIGNONMSGSRSV1/SONRS/STATUS/MESSAGE");
 
         String CODE = JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/STATUS/CODE");
-        if (!"0".equals(CODE) && !"".equals(CODE)) return JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/STATUS/MESSAGE");
+        if (!"0".equals(CODE) && !"".equals(CODE))
+            return JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/STATUS/MESSAGE");
         if ("0".equals(CODE) && "0".equals(C)) return "处理成功";
 
         String XFERPRCCODE = JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/RSBODY/XFERPRCSTS/XFERPRCCODE");
         if ("0".equals(CODE) && "PAYOUT".equals(XFERPRCCODE)) return "交易成功";
-        if ("0".equals(CODE) && !"PAYOUT".equals(XFERPRCCODE)) return JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/RSBODY/XFERPRCSTS/MESSAGE");
+        if ("0".equals(CODE) && !"PAYOUT".equals(XFERPRCCODE))
+            return JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/RSBODY/XFERPRCSTS/MESSAGE");
 
         return XFERPRCCODE + ":" + JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/RSBODY/XFERPRCSTS/MESSAGE");
     }
+
+    public static BigDecimal checkBigDecimal(String str) {
+        if("".equals(str)) return BigDecimal.ZERO;
+        return new BigDecimal(str);
+    }
 }

+ 8 - 0
ruoyi-ui/src/api/bank/tenderpub.js

@@ -42,3 +42,11 @@ export function delTenderpub(tenderpubid) {
     method: 'delete'
   })
 }
+
+// 生成保证金入账数据
+export function getInfo(depositid) {
+	return request({
+		url: '/bank/deposit/' + depositid,
+		method: 'get'
+	})
+}

+ 685 - 656
ruoyi-ui/src/views/bank/depositdesc/index.vue

@@ -1,668 +1,697 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="采购计划" prop="ppid">
-        <el-input
-          v-model="queryParams.ppid"
-          placeholder="请输入采购计划id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="流水号" prop="trnuid">
-        <el-input
-          v-model="queryParams.trnuid"
-          placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="报文节点" prop="rqbody">
-        <el-input
-          v-model="queryParams.rqbody"
-          placeholder="请输入报文节点"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="标段id" prop="sgtid">
-        <el-input
-          v-model="queryParams.sgtid"
-          placeholder="请输入标段id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="标段编号" prop="sgtno">
-        <el-input
-          v-model="queryParams.sgtno"
-          placeholder="请输入标段编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目编号" prop="prjno">
-        <el-input
-          v-model="queryParams.prjno"
-          placeholder="请输入项目编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="核心客户号" prop="pltfmcstno">
-        <el-input
-          v-model="queryParams.pltfmcstno"
-          placeholder="请输入核心客户号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="企业名称" prop="entpnm">
-        <el-input
-          v-model="queryParams.entpnm"
-          placeholder="请输入企业名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="租户号" prop="rtnLescstno">
-        <el-input
-          v-model="queryParams.rtnLescstno"
-          placeholder="请输入租户号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="投标编号" prop="rtnTdrno">
-        <el-input
-          v-model="queryParams.rtnTdrno"
-          placeholder="请输入投标编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户编号" prop="rtnCstno">
-        <el-input
-          v-model="queryParams.rtnCstno"
-          placeholder="请输入客户编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目编号" prop="rtnPrjno">
-        <el-input
-          v-model="queryParams.rtnPrjno"
-          placeholder="请输入项目编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目名称" prop="rtnPrjnm">
-        <el-input
-          v-model="queryParams.rtnPrjnm"
-          placeholder="请输入项目名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="标段编号" prop="rtnSgtno">
-        <el-input
-          v-model="queryParams.rtnSgtno"
-          placeholder="请输入标段编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="标段名称" prop="rtnSgtnm">
-        <el-input
-          v-model="queryParams.rtnSgtnm"
-          placeholder="请输入标段名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="投标状态" prop="rtnSgtst">
-        <el-input
-          v-model="queryParams.rtnSgtst"
-          placeholder="请输入投标状态0-未中标1-已中标"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="保证金状态" prop="rtnMrgnst">
-        <el-input
-          v-model="queryParams.rtnMrgnst"
-          placeholder="请输入保证金状态 1-竞标"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="缴纳类型" prop="rtnDuetp">
-        <el-input
-          v-model="queryParams.rtnDuetp"
-          placeholder="请输入缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员编号" prop="rtnMbrshpno">
-        <el-input
-          v-model="queryParams.rtnMbrshpno"
-          placeholder="请输入会员编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+				 label-width="68px">
+			<el-form-item label="采购计划" prop="ppid">
+				<el-input
+					v-model="queryParams.ppid"
+					placeholder="请输入采购计划id"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="流水号" prop="trnuid">
+				<el-input
+					v-model="queryParams.trnuid"
+					placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="报文节点" prop="rqbody">
+				<el-input
+					v-model="queryParams.rqbody"
+					placeholder="请输入报文节点"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="标段id" prop="sgtid">
+				<el-input
+					v-model="queryParams.sgtid"
+					placeholder="请输入标段id"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="标段编号" prop="sgtno">
+				<el-input
+					v-model="queryParams.sgtno"
+					placeholder="请输入标段编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="项目编号" prop="prjno">
+				<el-input
+					v-model="queryParams.prjno"
+					placeholder="请输入项目编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="核心客户号" prop="pltfmcstno">
+				<el-input
+					v-model="queryParams.pltfmcstno"
+					placeholder="请输入核心客户号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="企业名称" prop="entpnm">
+				<el-input
+					v-model="queryParams.entpnm"
+					placeholder="请输入企业名称"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="租户号" prop="rtnLescstno">
+				<el-input
+					v-model="queryParams.rtnLescstno"
+					placeholder="请输入租户号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="投标编号" prop="rtnTdrno">
+				<el-input
+					v-model="queryParams.rtnTdrno"
+					placeholder="请输入投标编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="客户编号" prop="rtnCstno">
+				<el-input
+					v-model="queryParams.rtnCstno"
+					placeholder="请输入客户编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="项目编号" prop="rtnPrjno">
+				<el-input
+					v-model="queryParams.rtnPrjno"
+					placeholder="请输入项目编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="项目名称" prop="rtnPrjnm">
+				<el-input
+					v-model="queryParams.rtnPrjnm"
+					placeholder="请输入项目名称"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="标段编号" prop="rtnSgtno">
+				<el-input
+					v-model="queryParams.rtnSgtno"
+					placeholder="请输入标段编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="标段名称" prop="rtnSgtnm">
+				<el-input
+					v-model="queryParams.rtnSgtnm"
+					placeholder="请输入标段名称"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="投标状态" prop="rtnSgtst">
+				<el-input
+					v-model="queryParams.rtnSgtst"
+					placeholder="请输入投标状态0-未中标1-已中标"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="保证金状态" prop="rtnMrgnst">
+				<el-input
+					v-model="queryParams.rtnMrgnst"
+					placeholder="请输入保证金状态 1-竞标"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="缴纳类型" prop="rtnDuetp">
+				<el-input
+					v-model="queryParams.rtnDuetp"
+					placeholder="请输入缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="会员编号" prop="rtnMbrshpno">
+				<el-input
+					v-model="queryParams.rtnMbrshpno"
+					placeholder="请输入会员编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['bank:depositdesc:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['bank:depositdesc:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['bank:depositdesc:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['bank:depositdesc:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['bank:depositdesc:add']"
+				>新增
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-edit"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['bank:depositdesc:edit']"
+				>修改
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="multiple"
+					@click="handleDelete"
+					v-hasPermi="['bank:depositdesc:remove']"
+				>删除
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['bank:depositdesc:export']"
+				>批量退还保证金
+				</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
 
-    <el-table v-loading="loading" :data="depositdescList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="查询保证金入账明细id" align="center" prop="depositdescid" />
-      <el-table-column label="采购计划id" align="center" prop="ppid" />
-      <el-table-column label="客户端交易的唯一流水号建议值为yyyymmdd+序号" align="center" prop="trnuid" />
-      <el-table-column label="报文节点" align="center" prop="rqbody" />
-      <el-table-column label="标段id" align="center" prop="sgtid" />
-      <el-table-column label="标段编号" align="center" prop="sgtno" />
-      <el-table-column label="项目编号" align="center" prop="prjno" />
-      <el-table-column label="核心客户号" align="center" prop="pltfmcstno" />
-      <el-table-column label="企业名称" align="center" prop="entpnm" />
-      <el-table-column label="页码不输默认查询第一页" align="center" prop="pgno" />
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid" />
-      <el-table-column label="交易处理状态" align="center" prop="rtnStatus" />
-      <el-table-column label="处理结果码" align="center" prop="rtnCode" />
-      <el-table-column label="处理结果等级(info/warn/error)" align="center" prop="rtnSeverity" />
-      <el-table-column label="处理信息描述" align="center" prop="rtnMessage" />
-      <el-table-column label="报文节点" align="center" prop="rtnRsbody" />
-      <el-table-column label="记录总数" align="center" prop="rtnRcrdtotnum" />
-      <el-table-column label="当前页码" align="center" prop="rtnCrnpgno" />
-      <el-table-column label="每页记录数" align="center" prop="rtnPgrcrdnum" />
-      <el-table-column label="总页数" align="center" prop="rtnTotpgnum" />
-      <el-table-column label="明细报文标识" align="center" prop="rtnContent" />
-      <el-table-column label="租户号" align="center" prop="rtnLescstno" />
-      <el-table-column label="投标编号" align="center" prop="rtnTdrno" />
-      <el-table-column label="客户编号" align="center" prop="rtnCstno" />
-      <el-table-column label="项目编号" align="center" prop="rtnPrjno" />
-      <el-table-column label="项目名称" align="center" prop="rtnPrjnm" />
-      <el-table-column label="标段编号" align="center" prop="rtnSgtno" />
-      <el-table-column label="标段名称" align="center" prop="rtnSgtnm" />
-      <el-table-column label="投标状态0-未中标1-已中标" align="center" prop="rtnSgtst" />
-      <el-table-column label="保证金状态 1-竞标" align="center" prop="rtnMrgnst" />
-      <el-table-column label="投标账号" align="center" prop="rtnTdracctno" />
-      <el-table-column label="投标账号币种01-人民币" align="center" prop="rtnTdracctnoccycd" />
-      <el-table-column label="投标账户名称" align="center" prop="rtnTdracctnm" />
-      <el-table-column label="投标账号行号" align="center" prop="rtnTdracctnobnkno" />
-      <el-table-column label="投标账号行名" align="center" prop="rtnTdracctnobnknm" />
-      <el-table-column label="投标数量" align="center" prop="rtnTdrnum" />
-      <el-table-column label="保证金金额 double" align="center" prop="rtnMrgnamt" />
-      <el-table-column label="中标金额 double" align="center" prop="rtnTdramt" />
-      <el-table-column label="代理服务费 double" align="center" prop="rtnAgncsvcfee" />
-      <el-table-column label="冻结金额 double" align="center" prop="rtnFrzamt" />
-      <el-table-column label="罚没金额 double" align="center" prop="rtnFineamt" />
-      <el-table-column label="投标日期yyyymmdd" align="center" prop="rtnTdrdt" />
-      <el-table-column label="投标时间hhmmss" align="center" prop="rtnTdrtm" />
-      <el-table-column label="缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函" align="center" prop="rtnDuetp" />
-      <el-table-column label="会员编号" align="center" prop="rtnMbrshpno" />
-      <el-table-column label="服务费 double" align="center" prop="rtnSvcfee" />
-      <el-table-column label="交易附言" align="center" prop="rtnRemark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['bank:depositdesc:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['bank:depositdesc:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+		<el-table v-loading="loading" :data="depositdescList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center"/>
+			<el-table-column label="查询保证金入账明细id" align="center" prop="depositdescid" v-if="false"/>
+			<el-table-column label="采购公告" align="center" prop="ppid"/>
+			<el-table-column label="银行流水" align="center" prop="trnuid" v-if="false"/>
+			<el-table-column label="报文节点" align="center" prop="rqbody" v-if="false"/>
+			<el-table-column label="标段ID" align="center" prop="sgtid"/>
+			<el-table-column label="标段编号" align="center" prop="sgtno" v-if="false"/>
+			<el-table-column label="项目编号" align="center" prop="prjno" v-if="false"/>
+			<el-table-column label="核心客户号" align="center" prop="pltfmcstno" v-if="false"/>
+			<el-table-column label="企业名称" align="center" prop="entpnm" v-if="false"/>
+			<el-table-column label="页码不输默认查询第一页" align="center" prop="pgno" v-if="false"/>
+			<el-table-column label="版本号" align="center" prop="version" v-if="false"/>
+			<el-table-column label="银行流水" align="center" prop="rtnTrnuid"/>
+			<el-table-column label="交易处理状态" align="center" prop="rtnStatus" v-if="false"/>
+			<el-table-column label="处理结果码" align="center" prop="rtnCode" v-if="false"/>
+			<el-table-column label="处理结果等级" align="center" prop="rtnSeverity">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnSeverity.toLowerCase() === 'info'">info</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnSeverity.toLowerCase() === 'warn'">warn</el-tag>
+					<el-tag type="danger" v-if="scope.row.rtnSeverity.toLowerCase() === 'error'">error</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="处理信息描述" align="center" prop="rtnMessage"/>
+			<el-table-column label="报文节点" align="center" prop="rtnRsbody" v-if="false"/>
+			<el-table-column label="记录总数" align="center" prop="rtnRcrdtotnum" v-if="false"/>
+			<el-table-column label="当前页码" align="center" prop="rtnCrnpgno" v-if="false"/>
+			<el-table-column label="每页记录数" align="center" prop="rtnPgrcrdnum" v-if="false"/>
+			<el-table-column label="总页数" align="center" prop="rtnTotpgnum" v-if="false"/>
+			<el-table-column label="明细报文标识" align="center" prop="rtnContent" v-if="false"/>
+			<el-table-column label="租户号" align="center" prop="rtnLescstno"/>
+			<el-table-column label="投标编号" align="center" prop="rtnTdrno"/>
+			<el-table-column label="客户编号" align="center" prop="rtnCstno"/>
+			<el-table-column label="项目编号" align="center" prop="rtnPrjno"/>
+			<el-table-column label="项目名称" align="center" prop="rtnPrjnm"/>
+			<el-table-column label="标段编号" align="center" prop="rtnSgtno"/>
+			<el-table-column label="标段名称" align="center" prop="rtnSgtnm"/>
+			<el-table-column label="投标状态0-未中标1-已中标" align="center" prop="rtnSgtst" v-if="false"/>
+			<el-table-column label="保证金状态 1-竞标" align="center" prop="rtnMrgnst" v-if="false"/>
+			<el-table-column label="投标账号" align="center" prop="rtnTdracctno"/>
+			<el-table-column label="投标账号币种01-人民币" align="center" prop="rtnTdracctnoccycd" v-if="false"/>
+			<el-table-column label="投标账户名称" align="center" prop="rtnTdracctnm"/>
+			<el-table-column label="投标账号行号" align="center" prop="rtnTdracctnobnkno"/>
+			<el-table-column label="投标账号行名" align="center" prop="rtnTdracctnobnknm"/>
+			<el-table-column label="投标数量" align="center" prop="rtnTdrnum"/>
+			<el-table-column label="保证金金额" align="center" prop="rtnMrgnamt"/>
+			<el-table-column label="中标金额" align="center" prop="rtnTdramt" v-if="false"/>
+			<el-table-column label="代理服务费" align="center" prop="rtnAgncsvcfee" v-if="false"/>
+			<el-table-column label="冻结金额" align="center" prop="rtnFrzamt" v-if="false"/>
+			<el-table-column label="罚没金额" align="center" prop="rtnFineamt" v-if="false"/>
+			<el-table-column label="投标日期" align="center" prop="rtnTdrdt">
+				<template slot-scope="scope">
+					{{ formatDate(scope.row.rtnTdrdt, scope.row.rtnTdrtm) }}
+				</template>
+			</el-table-column>
+			<el-table-column label="投标时间" align="center" prop="rtnTdrtm" v-if="false"/>
+			<el-table-column label="缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函" align="center" prop="rtnDuetp"
+							 v-if="false"/>
+			<el-table-column label="会员编号" align="center" prop="rtnMbrshpno" v-if="false"/>
+			<el-table-column label="服务费" align="center" prop="rtnSvcfee"/>
+			<el-table-column label="交易附言" align="center" prop="rtnRemark"/>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['bank:depositdesc:edit']"
+					>修改
+					</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['bank:depositdesc:remove']"
+					>删除
+					</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
 
-    <!-- 添加或修改查询保证金入账明细对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="采购计划id" prop="ppid">
-          <el-input v-model="form.ppid" placeholder="请输入采购计划id" />
-        </el-form-item>
-        <el-form-item label="客户端交易的唯一流水号建议值为yyyymmdd+序号" prop="trnuid">
-          <el-input v-model="form.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号" />
-        </el-form-item>
-        <el-form-item label="报文节点" prop="rqbody">
-          <el-input v-model="form.rqbody" placeholder="请输入报文节点" />
-        </el-form-item>
-        <el-form-item label="标段id" prop="sgtid">
-          <el-input v-model="form.sgtid" placeholder="请输入标段id" />
-        </el-form-item>
-        <el-form-item label="标段编号" prop="sgtno">
-          <el-input v-model="form.sgtno" placeholder="请输入标段编号" />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="prjno">
-          <el-input v-model="form.prjno" placeholder="请输入项目编号" />
-        </el-form-item>
-        <el-form-item label="核心客户号" prop="pltfmcstno">
-          <el-input v-model="form.pltfmcstno" placeholder="请输入核心客户号" />
-        </el-form-item>
-        <el-form-item label="企业名称" prop="entpnm">
-          <el-input v-model="form.entpnm" placeholder="请输入企业名称" />
-        </el-form-item>
-        <el-form-item label="页码不输默认查询第一页" prop="pgno">
-          <el-input v-model="form.pgno" placeholder="请输入页码不输默认查询第一页" />
-        </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" placeholder="请输入版本号" />
-        </el-form-item>
-        <el-form-item label="客户端交易的唯一标志" prop="rtnTrnuid">
-          <el-input v-model="form.rtnTrnuid" placeholder="请输入客户端交易的唯一标志" />
-        </el-form-item>
-        <el-form-item label="处理结果码" prop="rtnCode">
-          <el-input v-model="form.rtnCode" placeholder="请输入处理结果码" />
-        </el-form-item>
-        <el-form-item label="处理结果等级(info/warn/error)" prop="rtnSeverity">
-          <el-input v-model="form.rtnSeverity" placeholder="请输入处理结果等级(info/warn/error)" />
-        </el-form-item>
-        <el-form-item label="处理信息描述" prop="rtnMessage">
-          <el-input v-model="form.rtnMessage" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="报文节点" prop="rtnRsbody">
-          <el-input v-model="form.rtnRsbody" placeholder="请输入报文节点" />
-        </el-form-item>
-        <el-form-item label="记录总数" prop="rtnRcrdtotnum">
-          <el-input v-model="form.rtnRcrdtotnum" placeholder="请输入记录总数" />
-        </el-form-item>
-        <el-form-item label="当前页码" prop="rtnCrnpgno">
-          <el-input v-model="form.rtnCrnpgno" placeholder="请输入当前页码" />
-        </el-form-item>
-        <el-form-item label="每页记录数" prop="rtnPgrcrdnum">
-          <el-input v-model="form.rtnPgrcrdnum" placeholder="请输入每页记录数" />
-        </el-form-item>
-        <el-form-item label="总页数" prop="rtnTotpgnum">
-          <el-input v-model="form.rtnTotpgnum" placeholder="请输入总页数" />
-        </el-form-item>
-        <el-form-item label="明细报文标识">
-          <editor v-model="form.rtnContent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="租户号" prop="rtnLescstno">
-          <el-input v-model="form.rtnLescstno" placeholder="请输入租户号" />
-        </el-form-item>
-        <el-form-item label="投标编号" prop="rtnTdrno">
-          <el-input v-model="form.rtnTdrno" placeholder="请输入投标编号" />
-        </el-form-item>
-        <el-form-item label="客户编号" prop="rtnCstno">
-          <el-input v-model="form.rtnCstno" placeholder="请输入客户编号" />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="rtnPrjno">
-          <el-input v-model="form.rtnPrjno" placeholder="请输入项目编号" />
-        </el-form-item>
-        <el-form-item label="项目名称" prop="rtnPrjnm">
-          <el-input v-model="form.rtnPrjnm" placeholder="请输入项目名称" />
-        </el-form-item>
-        <el-form-item label="标段编号" prop="rtnSgtno">
-          <el-input v-model="form.rtnSgtno" placeholder="请输入标段编号" />
-        </el-form-item>
-        <el-form-item label="标段名称" prop="rtnSgtnm">
-          <el-input v-model="form.rtnSgtnm" placeholder="请输入标段名称" />
-        </el-form-item>
-        <el-form-item label="投标状态0-未中标1-已中标" prop="rtnSgtst">
-          <el-input v-model="form.rtnSgtst" placeholder="请输入投标状态0-未中标1-已中标" />
-        </el-form-item>
-        <el-form-item label="保证金状态 1-竞标" prop="rtnMrgnst">
-          <el-input v-model="form.rtnMrgnst" placeholder="请输入保证金状态 1-竞标" />
-        </el-form-item>
-        <el-form-item label="投标账号" prop="rtnTdracctno">
-          <el-input v-model="form.rtnTdracctno" placeholder="请输入投标账号" />
-        </el-form-item>
-        <el-form-item label="投标账号币种01-人民币" prop="rtnTdracctnoccycd">
-          <el-input v-model="form.rtnTdracctnoccycd" placeholder="请输入投标账号币种01-人民币" />
-        </el-form-item>
-        <el-form-item label="投标账户名称" prop="rtnTdracctnm">
-          <el-input v-model="form.rtnTdracctnm" placeholder="请输入投标账户名称" />
-        </el-form-item>
-        <el-form-item label="投标账号行号" prop="rtnTdracctnobnkno">
-          <el-input v-model="form.rtnTdracctnobnkno" placeholder="请输入投标账号行号" />
-        </el-form-item>
-        <el-form-item label="投标账号行名" prop="rtnTdracctnobnknm">
-          <el-input v-model="form.rtnTdracctnobnknm" placeholder="请输入投标账号行名" />
-        </el-form-item>
-        <el-form-item label="投标数量" prop="rtnTdrnum">
-          <el-input v-model="form.rtnTdrnum" placeholder="请输入投标数量" />
-        </el-form-item>
-        <el-form-item label="保证金金额 double" prop="rtnMrgnamt">
-          <el-input v-model="form.rtnMrgnamt" placeholder="请输入保证金金额 double" />
-        </el-form-item>
-        <el-form-item label="中标金额 double" prop="rtnTdramt">
-          <el-input v-model="form.rtnTdramt" placeholder="请输入中标金额 double" />
-        </el-form-item>
-        <el-form-item label="代理服务费 double" prop="rtnAgncsvcfee">
-          <el-input v-model="form.rtnAgncsvcfee" placeholder="请输入代理服务费 double" />
-        </el-form-item>
-        <el-form-item label="冻结金额 double" prop="rtnFrzamt">
-          <el-input v-model="form.rtnFrzamt" placeholder="请输入冻结金额 double" />
-        </el-form-item>
-        <el-form-item label="罚没金额 double" prop="rtnFineamt">
-          <el-input v-model="form.rtnFineamt" placeholder="请输入罚没金额 double" />
-        </el-form-item>
-        <el-form-item label="投标日期yyyymmdd" prop="rtnTdrdt">
-          <el-input v-model="form.rtnTdrdt" placeholder="请输入投标日期yyyymmdd" />
-        </el-form-item>
-        <el-form-item label="投标时间hhmmss" prop="rtnTdrtm">
-          <el-input v-model="form.rtnTdrtm" placeholder="请输入投标时间hhmmss" />
-        </el-form-item>
-        <el-form-item label="缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函" prop="rtnDuetp">
-          <el-input v-model="form.rtnDuetp" placeholder="请输入缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函" />
-        </el-form-item>
-        <el-form-item label="会员编号" prop="rtnMbrshpno">
-          <el-input v-model="form.rtnMbrshpno" placeholder="请输入会员编号" />
-        </el-form-item>
-        <el-form-item label="服务费 double" prop="rtnSvcfee">
-          <el-input v-model="form.rtnSvcfee" placeholder="请输入服务费 double" />
-        </el-form-item>
-        <el-form-item label="交易附言" prop="rtnRemark">
-          <el-input v-model="form.rtnRemark" placeholder="请输入交易附言" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+		<!-- 添加或修改查询保证金入账明细对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="采购计划id" prop="ppid">
+					<el-input v-model="form.ppid" placeholder="请输入采购计划id"/>
+				</el-form-item>
+				<el-form-item label="客户端交易的唯一流水号建议值为yyyymmdd+序号" prop="trnuid">
+					<el-input v-model="form.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号"/>
+				</el-form-item>
+				<el-form-item label="报文节点" prop="rqbody">
+					<el-input v-model="form.rqbody" placeholder="请输入报文节点"/>
+				</el-form-item>
+				<el-form-item label="标段id" prop="sgtid">
+					<el-input v-model="form.sgtid" placeholder="请输入标段id"/>
+				</el-form-item>
+				<el-form-item label="标段编号" prop="sgtno">
+					<el-input v-model="form.sgtno" placeholder="请输入标段编号"/>
+				</el-form-item>
+				<el-form-item label="项目编号" prop="prjno">
+					<el-input v-model="form.prjno" placeholder="请输入项目编号"/>
+				</el-form-item>
+				<el-form-item label="核心客户号" prop="pltfmcstno">
+					<el-input v-model="form.pltfmcstno" placeholder="请输入核心客户号"/>
+				</el-form-item>
+				<el-form-item label="企业名称" prop="entpnm">
+					<el-input v-model="form.entpnm" placeholder="请输入企业名称"/>
+				</el-form-item>
+				<el-form-item label="页码不输默认查询第一页" prop="pgno">
+					<el-input v-model="form.pgno" placeholder="请输入页码不输默认查询第一页"/>
+				</el-form-item>
+				<el-form-item label="版本号" prop="version">
+					<el-input v-model="form.version" placeholder="请输入版本号"/>
+				</el-form-item>
+				<el-form-item label="客户端交易的唯一标志" prop="rtnTrnuid">
+					<el-input v-model="form.rtnTrnuid" placeholder="请输入客户端交易的唯一标志"/>
+				</el-form-item>
+				<el-form-item label="处理结果码" prop="rtnCode">
+					<el-input v-model="form.rtnCode" placeholder="请输入处理结果码"/>
+				</el-form-item>
+				<el-form-item label="处理结果等级(info/warn/error)" prop="rtnSeverity">
+					<el-input v-model="form.rtnSeverity" placeholder="请输入处理结果等级(info/warn/error)"/>
+				</el-form-item>
+				<el-form-item label="处理信息描述" prop="rtnMessage">
+					<el-input v-model="form.rtnMessage" type="textarea" placeholder="请输入内容"/>
+				</el-form-item>
+				<el-form-item label="报文节点" prop="rtnRsbody">
+					<el-input v-model="form.rtnRsbody" placeholder="请输入报文节点"/>
+				</el-form-item>
+				<el-form-item label="记录总数" prop="rtnRcrdtotnum">
+					<el-input v-model="form.rtnRcrdtotnum" placeholder="请输入记录总数"/>
+				</el-form-item>
+				<el-form-item label="当前页码" prop="rtnCrnpgno">
+					<el-input v-model="form.rtnCrnpgno" placeholder="请输入当前页码"/>
+				</el-form-item>
+				<el-form-item label="每页记录数" prop="rtnPgrcrdnum">
+					<el-input v-model="form.rtnPgrcrdnum" placeholder="请输入每页记录数"/>
+				</el-form-item>
+				<el-form-item label="总页数" prop="rtnTotpgnum">
+					<el-input v-model="form.rtnTotpgnum" placeholder="请输入总页数"/>
+				</el-form-item>
+				<el-form-item label="明细报文标识">
+					<editor v-model="form.rtnContent" :min-height="192"/>
+				</el-form-item>
+				<el-form-item label="租户号" prop="rtnLescstno">
+					<el-input v-model="form.rtnLescstno" placeholder="请输入租户号"/>
+				</el-form-item>
+				<el-form-item label="投标编号" prop="rtnTdrno">
+					<el-input v-model="form.rtnTdrno" placeholder="请输入投标编号"/>
+				</el-form-item>
+				<el-form-item label="客户编号" prop="rtnCstno">
+					<el-input v-model="form.rtnCstno" placeholder="请输入客户编号"/>
+				</el-form-item>
+				<el-form-item label="项目编号" prop="rtnPrjno">
+					<el-input v-model="form.rtnPrjno" placeholder="请输入项目编号"/>
+				</el-form-item>
+				<el-form-item label="项目名称" prop="rtnPrjnm">
+					<el-input v-model="form.rtnPrjnm" placeholder="请输入项目名称"/>
+				</el-form-item>
+				<el-form-item label="标段编号" prop="rtnSgtno">
+					<el-input v-model="form.rtnSgtno" placeholder="请输入标段编号"/>
+				</el-form-item>
+				<el-form-item label="标段名称" prop="rtnSgtnm">
+					<el-input v-model="form.rtnSgtnm" placeholder="请输入标段名称"/>
+				</el-form-item>
+				<el-form-item label="投标状态0-未中标1-已中标" prop="rtnSgtst">
+					<el-input v-model="form.rtnSgtst" placeholder="请输入投标状态0-未中标1-已中标"/>
+				</el-form-item>
+				<el-form-item label="保证金状态 1-竞标" prop="rtnMrgnst">
+					<el-input v-model="form.rtnMrgnst" placeholder="请输入保证金状态 1-竞标"/>
+				</el-form-item>
+				<el-form-item label="投标账号" prop="rtnTdracctno">
+					<el-input v-model="form.rtnTdracctno" placeholder="请输入投标账号"/>
+				</el-form-item>
+				<el-form-item label="投标账号币种01-人民币" prop="rtnTdracctnoccycd">
+					<el-input v-model="form.rtnTdracctnoccycd" placeholder="请输入投标账号币种01-人民币"/>
+				</el-form-item>
+				<el-form-item label="投标账户名称" prop="rtnTdracctnm">
+					<el-input v-model="form.rtnTdracctnm" placeholder="请输入投标账户名称"/>
+				</el-form-item>
+				<el-form-item label="投标账号行号" prop="rtnTdracctnobnkno">
+					<el-input v-model="form.rtnTdracctnobnkno" placeholder="请输入投标账号行号"/>
+				</el-form-item>
+				<el-form-item label="投标账号行名" prop="rtnTdracctnobnknm">
+					<el-input v-model="form.rtnTdracctnobnknm" placeholder="请输入投标账号行名"/>
+				</el-form-item>
+				<el-form-item label="投标数量" prop="rtnTdrnum">
+					<el-input v-model="form.rtnTdrnum" placeholder="请输入投标数量"/>
+				</el-form-item>
+				<el-form-item label="保证金金额 double" prop="rtnMrgnamt">
+					<el-input v-model="form.rtnMrgnamt" placeholder="请输入保证金金额 double"/>
+				</el-form-item>
+				<el-form-item label="中标金额 double" prop="rtnTdramt">
+					<el-input v-model="form.rtnTdramt" placeholder="请输入中标金额 double"/>
+				</el-form-item>
+				<el-form-item label="代理服务费 double" prop="rtnAgncsvcfee">
+					<el-input v-model="form.rtnAgncsvcfee" placeholder="请输入代理服务费 double"/>
+				</el-form-item>
+				<el-form-item label="冻结金额 double" prop="rtnFrzamt">
+					<el-input v-model="form.rtnFrzamt" placeholder="请输入冻结金额 double"/>
+				</el-form-item>
+				<el-form-item label="罚没金额 double" prop="rtnFineamt">
+					<el-input v-model="form.rtnFineamt" placeholder="请输入罚没金额 double"/>
+				</el-form-item>
+				<el-form-item label="投标日期yyyymmdd" prop="rtnTdrdt">
+					<el-input v-model="form.rtnTdrdt" placeholder="请输入投标日期yyyymmdd"/>
+				</el-form-item>
+				<el-form-item label="投标时间hhmmss" prop="rtnTdrtm">
+					<el-input v-model="form.rtnTdrtm" placeholder="请输入投标时间hhmmss"/>
+				</el-form-item>
+				<el-form-item label="缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函" prop="rtnDuetp">
+					<el-input v-model="form.rtnDuetp"
+							  placeholder="请输入缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函"/>
+				</el-form-item>
+				<el-form-item label="会员编号" prop="rtnMbrshpno">
+					<el-input v-model="form.rtnMbrshpno" placeholder="请输入会员编号"/>
+				</el-form-item>
+				<el-form-item label="服务费 double" prop="rtnSvcfee">
+					<el-input v-model="form.rtnSvcfee" placeholder="请输入服务费 double"/>
+				</el-form-item>
+				<el-form-item label="交易附言" prop="rtnRemark">
+					<el-input v-model="form.rtnRemark" placeholder="请输入交易附言"/>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { listDepositdesc, getDepositdesc, delDepositdesc, addDepositdesc, updateDepositdesc } from "@/api/bank/depositdesc";
+import {
+	listDepositdesc,
+	getDepositdesc,
+	delDepositdesc,
+	addDepositdesc,
+	updateDepositdesc
+} from "@/api/bank/depositdesc";
 
 export default {
-  name: "Depositdesc",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 查询保证金入账明细表格数据
-      depositdescList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        ppid: null,
-        trnuid: null,
-        rqbody: null,
-        sgtid: null,
-        sgtno: null,
-        prjno: null,
-        pltfmcstno: null,
-        entpnm: null,
-        pgno: null,
-        version: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnMessage: null,
-        rtnRsbody: null,
-        rtnRcrdtotnum: null,
-        rtnCrnpgno: null,
-        rtnPgrcrdnum: null,
-        rtnTotpgnum: null,
-        rtnContent: null,
-        rtnLescstno: null,
-        rtnTdrno: null,
-        rtnCstno: null,
-        rtnPrjno: null,
-        rtnPrjnm: null,
-        rtnSgtno: null,
-        rtnSgtnm: null,
-        rtnSgtst: null,
-        rtnMrgnst: null,
-        rtnTdracctno: null,
-        rtnTdracctnoccycd: null,
-        rtnTdracctnm: null,
-        rtnTdracctnobnkno: null,
-        rtnTdracctnobnknm: null,
-        rtnTdrnum: null,
-        rtnMrgnamt: null,
-        rtnTdramt: null,
-        rtnAgncsvcfee: null,
-        rtnFrzamt: null,
-        rtnFineamt: null,
-        rtnTdrdt: null,
-        rtnTdrtm: null,
-        rtnDuetp: null,
-        rtnMbrshpno: null,
-        rtnSvcfee: null,
-        rtnRemark: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        ppid: [
-          { required: true, message: "采购计划id不能为空", trigger: "blur" }
-        ],
-        trnuid: [
-          { required: true, message: "客户端交易的唯一流水号建议值为yyyymmdd+序号不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询查询保证金入账明细列表 */
-    getList() {
-      this.loading = true;
-      listDepositdesc(this.queryParams).then(response => {
-        this.depositdescList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        depositdescid: null,
-        ppid: null,
-        trnuid: null,
-        rqbody: null,
-        sgtid: null,
-        sgtno: null,
-        prjno: null,
-        pltfmcstno: null,
-        entpnm: null,
-        pgno: null,
-        version: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnMessage: null,
-        rtnRsbody: null,
-        rtnRcrdtotnum: null,
-        rtnCrnpgno: null,
-        rtnPgrcrdnum: null,
-        rtnTotpgnum: null,
-        rtnContent: null,
-        rtnLescstno: null,
-        rtnTdrno: null,
-        rtnCstno: null,
-        rtnPrjno: null,
-        rtnPrjnm: null,
-        rtnSgtno: null,
-        rtnSgtnm: null,
-        rtnSgtst: null,
-        rtnMrgnst: null,
-        rtnTdracctno: null,
-        rtnTdracctnoccycd: null,
-        rtnTdracctnm: null,
-        rtnTdracctnobnkno: null,
-        rtnTdracctnobnknm: null,
-        rtnTdrnum: null,
-        rtnMrgnamt: null,
-        rtnTdramt: null,
-        rtnAgncsvcfee: null,
-        rtnFrzamt: null,
-        rtnFineamt: null,
-        rtnTdrdt: null,
-        rtnTdrtm: null,
-        rtnDuetp: null,
-        rtnMbrshpno: null,
-        rtnSvcfee: null,
-        rtnRemark: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.depositdescid)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加查询保证金入账明细";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const depositdescid = row.depositdescid || this.ids
-      getDepositdesc(depositdescid).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改查询保证金入账明细";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.depositdescid != null) {
-            updateDepositdesc(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addDepositdesc(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const depositdescids = row.depositdescid || this.ids;
-      this.$modal.confirm('是否确认删除查询保证金入账明细编号为"' + depositdescids + '"的数据项?').then(function() {
-        return delDepositdesc(depositdescids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('bank/depositdesc/export', {
-        ...this.queryParams
-      }, `depositdesc_${new Date().getTime()}.xlsx`)
-    }
-  }
+	name: "Depositdesc",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 查询保证金入账明细表格数据
+			depositdescList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				ppid: null,
+				trnuid: null,
+				rqbody: null,
+				sgtid: null,
+				sgtno: null,
+				prjno: null,
+				pltfmcstno: null,
+				entpnm: null,
+				pgno: null,
+				version: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnMessage: null,
+				rtnRsbody: null,
+				rtnRcrdtotnum: null,
+				rtnCrnpgno: null,
+				rtnPgrcrdnum: null,
+				rtnTotpgnum: null,
+				rtnContent: null,
+				rtnLescstno: null,
+				rtnTdrno: null,
+				rtnCstno: null,
+				rtnPrjno: null,
+				rtnPrjnm: null,
+				rtnSgtno: null,
+				rtnSgtnm: null,
+				rtnSgtst: null,
+				rtnMrgnst: null,
+				rtnTdracctno: null,
+				rtnTdracctnoccycd: null,
+				rtnTdracctnm: null,
+				rtnTdracctnobnkno: null,
+				rtnTdracctnobnknm: null,
+				rtnTdrnum: null,
+				rtnMrgnamt: null,
+				rtnTdramt: null,
+				rtnAgncsvcfee: null,
+				rtnFrzamt: null,
+				rtnFineamt: null,
+				rtnTdrdt: null,
+				rtnTdrtm: null,
+				rtnDuetp: null,
+				rtnMbrshpno: null,
+				rtnSvcfee: null,
+				rtnRemark: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+				ppid: [
+					{required: true, message: "采购计划id不能为空", trigger: "blur"}
+				],
+				trnuid: [
+					{required: true, message: "客户端交易的唯一流水号建议值为yyyymmdd+序号不能为空", trigger: "blur"}
+				],
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 查询查询保证金入账明细列表 */
+		getList() {
+			this.loading = true;
+			listDepositdesc(this.queryParams).then(response => {
+				this.depositdescList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				depositdescid: null,
+				ppid: null,
+				trnuid: null,
+				rqbody: null,
+				sgtid: null,
+				sgtno: null,
+				prjno: null,
+				pltfmcstno: null,
+				entpnm: null,
+				pgno: null,
+				version: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnMessage: null,
+				rtnRsbody: null,
+				rtnRcrdtotnum: null,
+				rtnCrnpgno: null,
+				rtnPgrcrdnum: null,
+				rtnTotpgnum: null,
+				rtnContent: null,
+				rtnLescstno: null,
+				rtnTdrno: null,
+				rtnCstno: null,
+				rtnPrjno: null,
+				rtnPrjnm: null,
+				rtnSgtno: null,
+				rtnSgtnm: null,
+				rtnSgtst: null,
+				rtnMrgnst: null,
+				rtnTdracctno: null,
+				rtnTdracctnoccycd: null,
+				rtnTdracctnm: null,
+				rtnTdracctnobnkno: null,
+				rtnTdracctnobnknm: null,
+				rtnTdrnum: null,
+				rtnMrgnamt: null,
+				rtnTdramt: null,
+				rtnAgncsvcfee: null,
+				rtnFrzamt: null,
+				rtnFineamt: null,
+				rtnTdrdt: null,
+				rtnTdrtm: null,
+				rtnDuetp: null,
+				rtnMbrshpno: null,
+				rtnSvcfee: null,
+				rtnRemark: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.depositdescid)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加查询保证金入账明细";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const depositdescid = row.depositdescid || this.ids
+			getDepositdesc(depositdescid).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改查询保证金入账明细";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.depositdescid != null) {
+						updateDepositdesc(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addDepositdesc(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const depositdescids = row.depositdescid || this.ids;
+			this.$modal.confirm('是否确认删除查询保证金入账明细编号为"' + depositdescids + '"的数据项?').then(function () {
+				return delDepositdesc(depositdescids);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('bank/depositdesc/export', {
+				...this.queryParams
+			}, `depositdesc_${new Date().getTime()}.xlsx`)
+		},
+		formatDate(dateStr, timeStr) {
+			return dateStr.substring(0, 4) + "-" + dateStr.substring(4, 6) + "-" + dateStr.substring(6, 8) + " " + timeStr.substring(0, 2) + ":" + timeStr.substring(2, 4) + ":" + timeStr.substring(4, 6)
+		}
+	}
 };
 </script>

+ 471 - 443
ruoyi-ui/src/views/bank/tenderpub/index.vue

@@ -1,457 +1,485 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="采购计划" prop="ppid">
-        <el-input v-model="queryParams.ppid" placeholder="请输入采购计划id" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="交易流水" prop="trnuid">
-        <el-input v-model="queryParams.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为YYYYMMDD+序号" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="账号" prop="acctno">
-        <el-input v-model="queryParams.acctno" placeholder="请输入账号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="币种01" prop="ccycd">
-        <el-input v-model="queryParams.ccycd" placeholder="请输入币种01-人民币" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="项目编号" prop="prjno">
-        <el-input v-model="queryParams.prjno" placeholder="请输入项目编号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="标段编号" prop="sgtno">
-        <el-input v-model="queryParams.sgtno" placeholder="请输入标段编号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="标段名称" prop="sgtnm">
-        <el-input v-model="queryParams.sgtnm" placeholder="请输入标段名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+				 label-width="68px">
+			<el-form-item label="采购计划" prop="ppid">
+				<el-input v-model="queryParams.ppid" placeholder="请输入采购计划id" clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
+			<el-form-item label="交易流水" prop="trnuid">
+				<el-input v-model="queryParams.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为YYYYMMDD+序号"
+						  clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
+			<el-form-item label="账号" prop="acctno">
+				<el-input v-model="queryParams.acctno" placeholder="请输入账号" clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
+			<el-form-item label="币种01" prop="ccycd">
+				<el-input v-model="queryParams.ccycd" placeholder="请输入币种01-人民币" clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
+			<el-form-item label="项目编号" prop="prjno">
+				<el-input v-model="queryParams.prjno" placeholder="请输入项目编号" clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
+			<el-form-item label="标段编号" prop="sgtno">
+				<el-input v-model="queryParams.sgtno" placeholder="请输入标段编号" clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
+			<el-form-item label="标段名称" prop="sgtnm">
+				<el-input v-model="queryParams.sgtnm" placeholder="请输入标段名称" clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
 
-      <el-form-item label="标段名称" prop="rtnSgtnm">
-        <el-input v-model="queryParams.rtnSgtnm" placeholder="请输入标段名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="标段id" prop="rtnSgtid">
-        <el-input v-model="queryParams.rtnSgtid" placeholder="请输入标段id" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+			<el-form-item label="标段名称" prop="rtnSgtnm">
+				<el-input v-model="queryParams.rtnSgtnm" placeholder="请输入标段名称" clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
+			<el-form-item label="标段id" prop="rtnSgtid">
+				<el-input v-model="queryParams.rtnSgtid" placeholder="请输入标段id" clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
 
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['bank:tenderpub:add']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['bank:tenderpub:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['bank:tenderpub:remove']">删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['bank:tenderpub:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+						   v-hasPermi="['bank:tenderpub:add']">新增
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+						   v-hasPermi="['bank:tenderpub:edit']">修改
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+						   @click="handleDelete"
+						   v-hasPermi="['bank:tenderpub:remove']">删除
+				</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+						   v-hasPermi="['bank:tenderpub:export']">导出
+				</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
 
-    <el-table v-loading="loading" :data="tenderpubList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="标段发布id" align="center" prop="tenderpubid" v-if="false" />
-      <el-table-column label="招标项目" align="center" prop="ppid" />
-      <el-table-column label="银行流水" align="center" prop="trnuid" />
-      <el-table-column label="账号" align="center" prop="acctno" />
-      <el-table-column label="币种01-人民币" align="center" prop="ccycd" v-if="false" />
-      <el-table-column label="项目编号" align="center" prop="prjno" />
-      <el-table-column label="标段编号" align="center" prop="sgtno" />
-      <el-table-column label="标段名称" align="center" prop="sgtnm" width="150" />
-      <el-table-column label="标段账户生成类型0-自动生成 1-自定义账号" align="center" prop="sgtacctgentp" v-if="false" />
-      <el-table-column label="标段账号:标段账户生成类型为1时必输,为0时不能传入" align="center" prop="sgtacctno" v-if="false" />
-      <el-table-column label="标段类型0-非会员模式 1-会员模式 2-公共标段模式" align="center" prop="sgttp" v-if="false" />
-      <el-table-column label="计息标志0-不计息 1-计息" align="center" prop="intacrlflg" v-if="false" />
-      <el-table-column label="保密类型0-不保密 1-保密" align="center" prop="secrettp" v-if="false" />
-      <el-table-column label="投标账号白名单校验标志0-不校验 1-校验 " align="center" prop="tdracctnovrfyflg" v-if="false" />
-      <el-table-column label="允许截止后投标标志0-不允许 1-允许 " align="center" prop="alwafddlntdrflg" v-if="false" />
-      <el-table-column label="银行退款确认标志0-不确认 1-确认 " align="center" prop="bnkrfndcfrmflg" v-if="false" />
-      <el-table-column label="保证金金额" align="center" prop="mrgnamt" width="100" />
-      <el-table-column label="发标日期" align="center" prop="strtsgtdt" width="100" />
-      <el-table-column label="到期日期 yyyyMMdd" align="center" prop="expdt" v-if="false" />
-      <el-table-column label="保证金缴纳截止日期" align="center" prop="mrgnduestopdt" width="100">
-        <template slot-scope="scope">
-          {{ formatDate(scope.row.mrgnduestopdt, scope.row.mrgnduestoptm) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="开标日期" align="center" prop="opntdrdt" width="100">
-        <template slot-scope="scope">
-          {{ formatDate(scope.row.opntdrdt, scope.row.opntdrtm) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid" width="150" />
-      <el-table-column label="交易处理状态" align="center" prop="rtnStatus" v-if="false" />
-      <el-table-column label="处理结果码" align="center" prop="rtnCode" v-if="false" />
-      <el-table-column label="处理结果等级" align="center" prop="rtnSeverity" v-if="false" />
-      <el-table-column label="处理信息描述" align="center" prop="rtnMessage" />
-      <el-table-column label="账号" align="center" prop="rtnAcctno" />
-      <el-table-column label="项目编号" align="center" prop="rtnPrjno" />
-      <el-table-column label="标段编号" align="center" prop="rtnSgtno" />
-      <el-table-column label="标段名称" align="center" prop="rtnSgtnm" />
-      <el-table-column label="标段ID" align="center" prop="rtnSgtid" width="150" />
-      <el-table-column label="6位子账户序号" align="center" prop="rtnSgtvrtlno" />
-      <el-table-column label="指令处理状态报文标识" align="center" prop="rtnXferprcsts" v-if="false" />
-      <el-table-column label="指令状态编码" align="center" prop="rtnXferprccode" />
-      <el-table-column label="指令处理时间" align="center" prop="rtnDtxferprc" width="100" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="handleInfoQuery(scope.row)">标段信息查询</el-button>
-			<el-button size="mini" type="text" @click="handleInfoQuery(scope.row)">保证金入账数量</el-button>
-			<el-button size="mini" type="text" @click="handleInfoQuery(scope.row)">保证金入账明细</el-button>
-			<el-button size="mini" type="text" @click="handleInfoQuery(scope.row)">保证金管理</el-button>
-			<el-button size="mini" type="text" @click="handleInfoQuery(scope.row)">信息查询</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['bank:tenderpub:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['bank:tenderpub:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+		<el-table v-loading="loading" :data="tenderpubList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center"/>
+			<el-table-column label="标段发布id" align="center" prop="tenderpubid" v-if="false"/>
+			<el-table-column label="招标项目" align="center" prop="ppid"/>
+			<el-table-column label="银行流水" align="center" prop="trnuid"/>
+			<el-table-column label="账号" align="center" prop="acctno"/>
+			<el-table-column label="币种01-人民币" align="center" prop="ccycd" v-if="false"/>
+			<el-table-column label="项目编号" align="center" prop="prjno"/>
+			<el-table-column label="标段编号" align="center" prop="sgtno"/>
+			<el-table-column label="标段名称" align="center" prop="sgtnm" width="150"/>
+			<el-table-column label="标段账户生成类型0-自动生成 1-自定义账号" align="center" prop="sgtacctgentp"
+							 v-if="false"/>
+			<el-table-column label="标段账号:标段账户生成类型为1时必输,为0时不能传入" align="center" prop="sgtacctno"
+							 v-if="false"/>
+			<el-table-column label="标段类型0-非会员模式 1-会员模式 2-公共标段模式" align="center" prop="sgttp"
+							 v-if="false"/>
+			<el-table-column label="计息标志0-不计息 1-计息" align="center" prop="intacrlflg" v-if="false"/>
+			<el-table-column label="保密类型0-不保密 1-保密" align="center" prop="secrettp" v-if="false"/>
+			<el-table-column label="投标账号白名单校验标志0-不校验 1-校验 " align="center" prop="tdracctnovrfyflg"
+							 v-if="false"/>
+			<el-table-column label="允许截止后投标标志0-不允许 1-允许 " align="center" prop="alwafddlntdrflg"
+							 v-if="false"/>
+			<el-table-column label="银行退款确认标志0-不确认 1-确认 " align="center" prop="bnkrfndcfrmflg"
+							 v-if="false"/>
+			<el-table-column label="保证金金额" align="center" prop="mrgnamt" width="100"/>
+			<el-table-column label="发标日期" align="center" prop="strtsgtdt" width="100"/>
+			<el-table-column label="到期日期 yyyyMMdd" align="center" prop="expdt" v-if="false"/>
+			<el-table-column label="保证金缴纳截止日期" align="center" prop="mrgnduestopdt" width="100">
+				<template slot-scope="scope">
+					{{ formatDate(scope.row.mrgnduestopdt, scope.row.mrgnduestoptm) }}
+				</template>
+			</el-table-column>
+			<el-table-column label="开标日期" align="center" prop="opntdrdt" width="100">
+				<template slot-scope="scope">
+					{{ formatDate(scope.row.opntdrdt, scope.row.opntdrtm) }}
+				</template>
+			</el-table-column>
+			<el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid" width="150"/>
+			<el-table-column label="交易处理状态" align="center" prop="rtnStatus" v-if="false"/>
+			<el-table-column label="处理结果码" align="center" prop="rtnCode" v-if="false"/>
+			<el-table-column label="处理结果等级" align="center" prop="rtnSeverity" v-if="false"/>
+			<el-table-column label="处理信息描述" align="center" prop="rtnMessage"/>
+			<el-table-column label="账号" align="center" prop="rtnAcctno"/>
+			<el-table-column label="项目编号" align="center" prop="rtnPrjno"/>
+			<el-table-column label="标段编号" align="center" prop="rtnSgtno"/>
+			<el-table-column label="标段名称" align="center" prop="rtnSgtnm"/>
+			<el-table-column label="标段ID" align="center" prop="rtnSgtid" width="150"/>
+			<el-table-column label="6位子账户序号" align="center" prop="rtnSgtvrtlno"/>
+			<el-table-column label="指令处理状态报文标识" align="center" prop="rtnXferprcsts" v-if="false"/>
+			<el-table-column label="指令状态编码" align="center" prop="rtnXferprccode"/>
+			<el-table-column label="指令处理时间" align="center" prop="rtnDtxferprc" width="100"/>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" @click="handleInfoQuery(scope.row)">标段信息查询</el-button>
+					<el-button size="mini" type="text" @click="getInfo(scope.row)">保证金入账查询</el-button>
+					<el-button size="mini" type="text" @click="handleInfoQuery(scope.row)">批量退还保证金</el-button>
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['bank:tenderpub:edit']">修改</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['bank:tenderpub:remove']">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+					:limit.sync="queryParams.pageSize"
+					@pagination="getList"/>
 
-    <!-- 添加或修改标段发布对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="采购计划id" prop="ppid">
-          <el-input v-model="form.ppid" placeholder="请输入采购计划id" />
-        </el-form-item>
-        <el-form-item label="客户端交易的唯一流水号建议值为YYYYMMDD+序号" prop="trnuid">
-          <el-input v-model="form.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为YYYYMMDD+序号" />
-        </el-form-item>
-        <el-form-item label="账号" prop="acctno">
-          <el-input v-model="form.acctno" placeholder="请输入账号" />
-        </el-form-item>
-        <el-form-item label="币种01-人民币" prop="ccycd">
-          <el-input v-model="form.ccycd" placeholder="请输入币种01-人民币" />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="prjno">
-          <el-input v-model="form.prjno" placeholder="请输入项目编号" />
-        </el-form-item>
-        <el-form-item label="标段编号" prop="sgtno">
-          <el-input v-model="form.sgtno" placeholder="请输入标段编号" />
-        </el-form-item>
-        <el-form-item label="标段名称" prop="sgtnm">
-          <el-input v-model="form.sgtnm" placeholder="请输入标段名称" />
-        </el-form-item>
-        <el-form-item label="标段账户生成类型0-自动生成 1-自定义账号" prop="sgtacctgentp">
-          <el-input v-model="form.sgtacctgentp" placeholder="请输入标段账户生成类型0-自动生成 1-自定义账号" />
-        </el-form-item>
-        <el-form-item label="标段账号:标段账户生成类型为1时必输,为0时不能传入" prop="sgtacctno">
-          <el-input v-model="form.sgtacctno" placeholder="请输入标段账号:标段账户生成类型为1时必输,为0时不能传入" />
-        </el-form-item>
-        <el-form-item label="标段类型0-非会员模式 1-会员模式 2-公共标段模式" prop="sgttp">
-          <el-input v-model="form.sgttp" placeholder="请输入标段类型0-非会员模式 1-会员模式 2-公共标段模式" />
-        </el-form-item>
-        <el-form-item label="计息标志0-不计息 1-计息" prop="intacrlflg">
-          <el-input v-model="form.intacrlflg" placeholder="请输入计息标志0-不计息 1-计息" />
-        </el-form-item>
-        <el-form-item label="保密类型0-不保密 1-保密" prop="secrettp">
-          <el-input v-model="form.secrettp" placeholder="请输入保密类型0-不保密 1-保密" />
-        </el-form-item>
-        <el-form-item label="投标账号白名单校验标志0-不校验 1-校验 " prop="tdracctnovrfyflg">
-          <el-input v-model="form.tdracctnovrfyflg" placeholder="请输入投标账号白名单校验标志0-不校验 1-校验 " />
-        </el-form-item>
-        <el-form-item label="允许截止后投标标志0-不允许 1-允许 " prop="alwafddlntdrflg">
-          <el-input v-model="form.alwafddlntdrflg" placeholder="请输入允许截止后投标标志0-不允许 1-允许 " />
-        </el-form-item>
-        <el-form-item label="银行退款确认标志0-不确认 1-确认 " prop="bnkrfndcfrmflg">
-          <el-input v-model="form.bnkrfndcfrmflg" placeholder="请输入银行退款确认标志0-不确认 1-确认 " />
-        </el-form-item>
-        <el-form-item label="保证金金额,double" prop="mrgnamt">
-          <el-input v-model="form.mrgnamt" placeholder="请输入保证金金额,double" />
-        </el-form-item>
-        <el-form-item label="发标日期 yyyyMMdd" prop="strtsgtdt">
-          <el-input v-model="form.strtsgtdt" placeholder="请输入发标日期 yyyyMMdd" />
-        </el-form-item>
-        <el-form-item label="到期日期 yyyyMMdd" prop="expdt">
-          <el-input v-model="form.expdt" placeholder="请输入到期日期 yyyyMMdd" />
-        </el-form-item>
-        <el-form-item label="保证金缴纳截止日期yyyyMMdd" prop="mrgnduestopdt">
-          <el-input v-model="form.mrgnduestopdt" placeholder="请输入保证金缴纳截止日期yyyyMMdd" />
-        </el-form-item>
-        <el-form-item label="保证金缴纳截止时间HHmmss" prop="mrgnduestoptm">
-          <el-input v-model="form.mrgnduestoptm" placeholder="请输入保证金缴纳截止时间HHmmss" />
-        </el-form-item>
-        <el-form-item label="开标日期,yyyyMMdd" prop="opntdrdt">
-          <el-input v-model="form.opntdrdt" placeholder="请输入开标日期,yyyyMMdd" />
-        </el-form-item>
-        <el-form-item label="开标时间,HHmmss" prop="opntdrtm">
-          <el-input v-model="form.opntdrtm" placeholder="请输入开标时间,HHmmss" />
-        </el-form-item>
-        <el-form-item label="客户端交易的唯一标志" prop="rtnTrnuid">
-          <el-input v-model="form.rtnTrnuid" placeholder="请输入客户端交易的唯一标志" />
-        </el-form-item>
-        <el-form-item label="处理结果码" prop="rtnCode">
-          <el-input v-model="form.rtnCode" placeholder="请输入处理结果码" />
-        </el-form-item>
-        <el-form-item label="处理结果等级(info/warn/error)" prop="rtnSeverity">
-          <el-input v-model="form.rtnSeverity" placeholder="请输入处理结果等级(info/warn/error)" />
-        </el-form-item>
-        <el-form-item label="处理信息描述" prop="rtnMessage">
-          <el-input v-model="form.rtnMessage" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="账号" prop="rtnAcctno">
-          <el-input v-model="form.rtnAcctno" placeholder="请输入账号" />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="rtnPrjno">
-          <el-input v-model="form.rtnPrjno" placeholder="请输入项目编号" />
-        </el-form-item>
-        <el-form-item label="标段编号" prop="rtnSgtno">
-          <el-input v-model="form.rtnSgtno" placeholder="请输入标段编号" />
-        </el-form-item>
-        <el-form-item label="标段名称" prop="rtnSgtnm">
-          <el-input v-model="form.rtnSgtnm" placeholder="请输入标段名称" />
-        </el-form-item>
-        <el-form-item label="标段id" prop="rtnSgtid">
-          <el-input v-model="form.rtnSgtid" placeholder="请输入标段id" />
-        </el-form-item>
-        <el-form-item label="6位子账户序号" prop="rtnSgtvrtlno">
-          <el-input v-model="form.rtnSgtvrtlno" placeholder="请输入6位子账户序号" />
-        </el-form-item>
-        <el-form-item label="指令处理状态报文标识" prop="rtnXferprcsts">
-          <el-input v-model="form.rtnXferprcsts" placeholder="请输入指令处理状态报文标识" />
-        </el-form-item>
-        <el-form-item label="指令状态编码" prop="rtnXferprccode">
-          <el-input v-model="form.rtnXferprccode" placeholder="请输入指令状态编码" />
-        </el-form-item>
-        <el-form-item label="指令处理时间yyyymmdd hhmmss" prop="rtnDtxferprc">
-          <el-input v-model="form.rtnDtxferprc" placeholder="请输入指令处理时间yyyymmdd hhmmss" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+		<!-- 添加或修改标段发布对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="采购计划id" prop="ppid">
+					<el-input v-model="form.ppid" placeholder="请输入采购计划id"/>
+				</el-form-item>
+				<el-form-item label="客户端交易的唯一流水号建议值为YYYYMMDD+序号" prop="trnuid">
+					<el-input v-model="form.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为YYYYMMDD+序号"/>
+				</el-form-item>
+				<el-form-item label="账号" prop="acctno">
+					<el-input v-model="form.acctno" placeholder="请输入账号"/>
+				</el-form-item>
+				<el-form-item label="币种01-人民币" prop="ccycd">
+					<el-input v-model="form.ccycd" placeholder="请输入币种01-人民币"/>
+				</el-form-item>
+				<el-form-item label="项目编号" prop="prjno">
+					<el-input v-model="form.prjno" placeholder="请输入项目编号"/>
+				</el-form-item>
+				<el-form-item label="标段编号" prop="sgtno">
+					<el-input v-model="form.sgtno" placeholder="请输入标段编号"/>
+				</el-form-item>
+				<el-form-item label="标段名称" prop="sgtnm">
+					<el-input v-model="form.sgtnm" placeholder="请输入标段名称"/>
+				</el-form-item>
+				<el-form-item label="标段账户生成类型0-自动生成 1-自定义账号" prop="sgtacctgentp">
+					<el-input v-model="form.sgtacctgentp" placeholder="请输入标段账户生成类型0-自动生成 1-自定义账号"/>
+				</el-form-item>
+				<el-form-item label="标段账号:标段账户生成类型为1时必输,为0时不能传入" prop="sgtacctno">
+					<el-input v-model="form.sgtacctno"
+							  placeholder="请输入标段账号:标段账户生成类型为1时必输,为0时不能传入"/>
+				</el-form-item>
+				<el-form-item label="标段类型0-非会员模式 1-会员模式 2-公共标段模式" prop="sgttp">
+					<el-input v-model="form.sgttp" placeholder="请输入标段类型0-非会员模式 1-会员模式 2-公共标段模式"/>
+				</el-form-item>
+				<el-form-item label="计息标志0-不计息 1-计息" prop="intacrlflg">
+					<el-input v-model="form.intacrlflg" placeholder="请输入计息标志0-不计息 1-计息"/>
+				</el-form-item>
+				<el-form-item label="保密类型0-不保密 1-保密" prop="secrettp">
+					<el-input v-model="form.secrettp" placeholder="请输入保密类型0-不保密 1-保密"/>
+				</el-form-item>
+				<el-form-item label="投标账号白名单校验标志0-不校验 1-校验 " prop="tdracctnovrfyflg">
+					<el-input v-model="form.tdracctnovrfyflg"
+							  placeholder="请输入投标账号白名单校验标志0-不校验 1-校验 "/>
+				</el-form-item>
+				<el-form-item label="允许截止后投标标志0-不允许 1-允许 " prop="alwafddlntdrflg">
+					<el-input v-model="form.alwafddlntdrflg" placeholder="请输入允许截止后投标标志0-不允许 1-允许 "/>
+				</el-form-item>
+				<el-form-item label="银行退款确认标志0-不确认 1-确认 " prop="bnkrfndcfrmflg">
+					<el-input v-model="form.bnkrfndcfrmflg" placeholder="请输入银行退款确认标志0-不确认 1-确认 "/>
+				</el-form-item>
+				<el-form-item label="保证金金额,double" prop="mrgnamt">
+					<el-input v-model="form.mrgnamt" placeholder="请输入保证金金额,double"/>
+				</el-form-item>
+				<el-form-item label="发标日期 yyyyMMdd" prop="strtsgtdt">
+					<el-input v-model="form.strtsgtdt" placeholder="请输入发标日期 yyyyMMdd"/>
+				</el-form-item>
+				<el-form-item label="到期日期 yyyyMMdd" prop="expdt">
+					<el-input v-model="form.expdt" placeholder="请输入到期日期 yyyyMMdd"/>
+				</el-form-item>
+				<el-form-item label="保证金缴纳截止日期yyyyMMdd" prop="mrgnduestopdt">
+					<el-input v-model="form.mrgnduestopdt" placeholder="请输入保证金缴纳截止日期yyyyMMdd"/>
+				</el-form-item>
+				<el-form-item label="保证金缴纳截止时间HHmmss" prop="mrgnduestoptm">
+					<el-input v-model="form.mrgnduestoptm" placeholder="请输入保证金缴纳截止时间HHmmss"/>
+				</el-form-item>
+				<el-form-item label="开标日期,yyyyMMdd" prop="opntdrdt">
+					<el-input v-model="form.opntdrdt" placeholder="请输入开标日期,yyyyMMdd"/>
+				</el-form-item>
+				<el-form-item label="开标时间,HHmmss" prop="opntdrtm">
+					<el-input v-model="form.opntdrtm" placeholder="请输入开标时间,HHmmss"/>
+				</el-form-item>
+				<el-form-item label="客户端交易的唯一标志" prop="rtnTrnuid">
+					<el-input v-model="form.rtnTrnuid" placeholder="请输入客户端交易的唯一标志"/>
+				</el-form-item>
+				<el-form-item label="处理结果码" prop="rtnCode">
+					<el-input v-model="form.rtnCode" placeholder="请输入处理结果码"/>
+				</el-form-item>
+				<el-form-item label="处理结果等级(info/warn/error)" prop="rtnSeverity">
+					<el-input v-model="form.rtnSeverity" placeholder="请输入处理结果等级(info/warn/error)"/>
+				</el-form-item>
+				<el-form-item label="处理信息描述" prop="rtnMessage">
+					<el-input v-model="form.rtnMessage" type="textarea" placeholder="请输入内容"/>
+				</el-form-item>
+				<el-form-item label="账号" prop="rtnAcctno">
+					<el-input v-model="form.rtnAcctno" placeholder="请输入账号"/>
+				</el-form-item>
+				<el-form-item label="项目编号" prop="rtnPrjno">
+					<el-input v-model="form.rtnPrjno" placeholder="请输入项目编号"/>
+				</el-form-item>
+				<el-form-item label="标段编号" prop="rtnSgtno">
+					<el-input v-model="form.rtnSgtno" placeholder="请输入标段编号"/>
+				</el-form-item>
+				<el-form-item label="标段名称" prop="rtnSgtnm">
+					<el-input v-model="form.rtnSgtnm" placeholder="请输入标段名称"/>
+				</el-form-item>
+				<el-form-item label="标段id" prop="rtnSgtid">
+					<el-input v-model="form.rtnSgtid" placeholder="请输入标段id"/>
+				</el-form-item>
+				<el-form-item label="6位子账户序号" prop="rtnSgtvrtlno">
+					<el-input v-model="form.rtnSgtvrtlno" placeholder="请输入6位子账户序号"/>
+				</el-form-item>
+				<el-form-item label="指令处理状态报文标识" prop="rtnXferprcsts">
+					<el-input v-model="form.rtnXferprcsts" placeholder="请输入指令处理状态报文标识"/>
+				</el-form-item>
+				<el-form-item label="指令状态编码" prop="rtnXferprccode">
+					<el-input v-model="form.rtnXferprccode" placeholder="请输入指令状态编码"/>
+				</el-form-item>
+				<el-form-item label="指令处理时间yyyymmdd hhmmss" prop="rtnDtxferprc">
+					<el-input v-model="form.rtnDtxferprc" placeholder="请输入指令处理时间yyyymmdd hhmmss"/>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { listTenderpub, getTenderpub, delTenderpub, addTenderpub, updateTenderpub } from "@/api/bank/tenderpub";
+import {listTenderpub, getTenderpub, delTenderpub, addTenderpub, updateTenderpub, getInfo} from "@/api/bank/tenderpub";
 
 export default {
-  name: "Tenderpub",
-  data () {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 标段发布表格数据
-      tenderpubList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        ppid: null,
-        trnuid: null,
-        acctno: null,
-        ccycd: null,
-        prjno: null,
-        sgtno: null,
-        sgtnm: null,
-        sgtacctgentp: null,
-        sgtacctno: null,
-        sgttp: null,
-        intacrlflg: null,
-        secrettp: null,
-        tdracctnovrfyflg: null,
-        alwafddlntdrflg: null,
-        bnkrfndcfrmflg: null,
-        mrgnamt: null,
-        strtsgtdt: null,
-        expdt: null,
-        mrgnduestopdt: null,
-        mrgnduestoptm: null,
-        opntdrdt: null,
-        opntdrtm: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnMessage: null,
-        rtnAcctno: null,
-        rtnPrjno: null,
-        rtnSgtno: null,
-        rtnSgtnm: null,
-        rtnSgtid: null,
-        rtnSgtvrtlno: null,
-        rtnXferprcsts: null,
-        rtnXferprccode: null,
-        rtnDtxferprc: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        ppid: [
-          { required: true, message: "采购计划id不能为空", trigger: "blur" }
-        ],
-        trnuid: [
-          { required: true, message: "客户端交易的唯一流水号建议值为YYYYMMDD+序号不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created () {
-    this.getList();
-  },
-  methods: {
-    /** 查询标段发布列表 */
-    getList () {
-      this.loading = true;
-      listTenderpub(this.queryParams).then(response => {
-        this.tenderpubList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel () {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset () {
-      this.form = {
-        tenderpubid: null,
-        ppid: null,
-        trnuid: null,
-        acctno: null,
-        ccycd: null,
-        prjno: null,
-        sgtno: null,
-        sgtnm: null,
-        sgtacctgentp: null,
-        sgtacctno: null,
-        sgttp: null,
-        intacrlflg: null,
-        secrettp: null,
-        tdracctnovrfyflg: null,
-        alwafddlntdrflg: null,
-        bnkrfndcfrmflg: null,
-        mrgnamt: null,
-        strtsgtdt: null,
-        expdt: null,
-        mrgnduestopdt: null,
-        mrgnduestoptm: null,
-        opntdrdt: null,
-        opntdrtm: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnMessage: null,
-        rtnAcctno: null,
-        rtnPrjno: null,
-        rtnSgtno: null,
-        rtnSgtnm: null,
-        rtnSgtid: null,
-        rtnSgtvrtlno: null,
-        rtnXferprcsts: null,
-        rtnXferprccode: null,
-        rtnDtxferprc: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery () {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery () {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange (selection) {
-      this.ids = selection.map(item => item.tenderpubid)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd () {
-      this.reset();
-      this.open = true;
-      this.title = "添加标段发布";
-    },
-    /** 信息查询按钮操作 */
-    handleInfoQuery (row) {
-      this.$router.push({ path: "/bank/tenderquery", query: { rtnSgtid: row.rtnSgtid } });
-    },
-    /** 修改按钮操作 */
-    handleUpdate (row) {
-      this.reset();
-      const tenderpubid = row.tenderpubid || this.ids
-      getTenderpub(tenderpubid).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改标段发布";
-      });
-    },
-    /** 提交按钮 */
-    submitForm () {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.tenderpubid != null) {
-            updateTenderpub(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addTenderpub(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete (row) {
-      const tenderpubids = row.tenderpubid || this.ids;
-      this.$modal.confirm('是否确认删除标段发布编号为"' + tenderpubids + '"的数据项?').then(function () {
-        return delTenderpub(tenderpubids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    /** 导出按钮操作 */
-    handleExport () {
-      this.download('bank/tenderpub/export', {
-        ...this.queryParams
-      }, `tenderpub_${new Date().getTime()}.xlsx`)
-    },
-    formatDate (dateStr, timeStr) {
-      return dateStr.substring(0, 4) + "-" + dateStr.substring(4, 6) + "-" + dateStr.substring(6, 8) + " " + timeStr.substring(0, 2) + ":" + timeStr.substring(2, 4) + ":" + timeStr.substring(4, 6)
-    }
-  }
+	name: "Tenderpub",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 标段发布表格数据
+			tenderpubList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				ppid: null,
+				trnuid: null,
+				acctno: null,
+				ccycd: null,
+				prjno: null,
+				sgtno: null,
+				sgtnm: null,
+				sgtacctgentp: null,
+				sgtacctno: null,
+				sgttp: null,
+				intacrlflg: null,
+				secrettp: null,
+				tdracctnovrfyflg: null,
+				alwafddlntdrflg: null,
+				bnkrfndcfrmflg: null,
+				mrgnamt: null,
+				strtsgtdt: null,
+				expdt: null,
+				mrgnduestopdt: null,
+				mrgnduestoptm: null,
+				opntdrdt: null,
+				opntdrtm: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnMessage: null,
+				rtnAcctno: null,
+				rtnPrjno: null,
+				rtnSgtno: null,
+				rtnSgtnm: null,
+				rtnSgtid: null,
+				rtnSgtvrtlno: null,
+				rtnXferprcsts: null,
+				rtnXferprccode: null,
+				rtnDtxferprc: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+				ppid: [
+					{required: true, message: "采购计划id不能为空", trigger: "blur"}
+				],
+				trnuid: [
+					{required: true, message: "客户端交易的唯一流水号建议值为YYYYMMDD+序号不能为空", trigger: "blur"}
+				],
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 查询标段发布列表 */
+		getList() {
+			this.loading = true;
+			listTenderpub(this.queryParams).then(response => {
+				this.tenderpubList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				tenderpubid: null,
+				ppid: null,
+				trnuid: null,
+				acctno: null,
+				ccycd: null,
+				prjno: null,
+				sgtno: null,
+				sgtnm: null,
+				sgtacctgentp: null,
+				sgtacctno: null,
+				sgttp: null,
+				intacrlflg: null,
+				secrettp: null,
+				tdracctnovrfyflg: null,
+				alwafddlntdrflg: null,
+				bnkrfndcfrmflg: null,
+				mrgnamt: null,
+				strtsgtdt: null,
+				expdt: null,
+				mrgnduestopdt: null,
+				mrgnduestoptm: null,
+				opntdrdt: null,
+				opntdrtm: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnMessage: null,
+				rtnAcctno: null,
+				rtnPrjno: null,
+				rtnSgtno: null,
+				rtnSgtnm: null,
+				rtnSgtid: null,
+				rtnSgtvrtlno: null,
+				rtnXferprcsts: null,
+				rtnXferprccode: null,
+				rtnDtxferprc: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.tenderpubid)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加标段发布";
+		},
+		/** 信息查询按钮操作 */
+		handleInfoQuery(row) {
+			this.$router.push({path: "/bank/tenderquery", query: {rtnSgtid: row.rtnSgtid}});
+		},
+		/** 查询保证金入账 */
+		getInfo(row) {
+			getInfo(row.ppid).then(response => {
+				console.log("getInfo", response.data);
+				this.$modal.msgSuccess(response.data);
+			});
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const tenderpubid = row.tenderpubid || this.ids
+			getTenderpub(tenderpubid).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改标段发布";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.tenderpubid != null) {
+						updateTenderpub(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addTenderpub(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const tenderpubids = row.tenderpubid || this.ids;
+			this.$modal.confirm('是否确认删除标段发布编号为"' + tenderpubids + '"的数据项?').then(function () {
+				return delTenderpub(tenderpubids);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('bank/tenderpub/export', {
+				...this.queryParams
+			}, `tenderpub_${new Date().getTime()}.xlsx`)
+		},
+		formatDate(dateStr, timeStr) {
+			return dateStr.substring(0, 4) + "-" + dateStr.substring(4, 6) + "-" + dateStr.substring(6, 8) + " " + timeStr.substring(0, 2) + ":" + timeStr.substring(2, 4) + ":" + timeStr.substring(4, 6)
+		}
+	}
 };
 </script>