不明保证金完事

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankUncleardepositController.java

@@ -1,14 +1,14 @@
 package com.ruoyi.mast.bank.controller;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
-import java.io.IOException;
 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.BankTenderpub;
+import com.ruoyi.mast.bank.domain.BankUncleardepositrfnd;
 import com.ruoyi.mast.bank.utils.JsonUtils;
 import com.ruoyi.system.api.RemotePlanService;
 import kong.unirest.core.HttpResponse;
@@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.mast.bank.domain.BankUncleardeposit;
 import com.ruoyi.mast.bank.service.IBankUncleardepositService;
 import com.ruoyi.common.core.web.controller.BaseController;
@@ -45,6 +44,9 @@ public class BankUncleardepositController extends BaseController {
     @Autowired
     private IBankUncleardepositService bankUncleardepositService;
 
+    @Autowired
+    private BankUncleardepositrfndController bankUncleardepositrfndController;
+
     @Autowired
     private RemotePlanService remotePlanService;
 
@@ -78,9 +80,21 @@ public class BankUncleardepositController extends BaseController {
      * 获取查询不明保证金明细详细信息
      */
     // @RequiresPermissions("bank:uncleardeposit:query")
+    @Log(title = "退回不明保证金", businessType = BusinessType.UPDATE)
     @GetMapping(value = "/{uncleardepositid}")
     public AjaxResult getInfo(@PathVariable("uncleardepositid") String uncleardepositid) {
-        return success(bankUncleardepositService.selectBankUncleardepositByUncleardepositid(uncleardepositid));
+        BankUncleardeposit bankUncleardeposit = bankUncleardepositService.selectBankUncleardepositByUncleardepositid(uncleardepositid);
+        if (bankUncleardeposit == null) return error("数据已被删除");
+
+        BankUncleardepositrfnd bt = new BankUncleardepositrfnd();
+        bt.setSerialno(bankUncleardeposit.getRtnSerialno());
+        bt.setTradedate(bankUncleardeposit.getRtnTradedate());
+        bt.setDestbailamt(bankUncleardeposit.getRtnSelfbal());
+
+        AjaxResult msg = bankUncleardepositrfndController.addBankUncleardepositrfnd(bt);
+
+        if ((msg != null) && msg.containsValue("成功")) return success(msg);
+        else return error(msg.get("msg").toString());
     }
 
     /**
@@ -103,8 +117,8 @@ public class BankUncleardepositController extends BaseController {
         bankUncleardeposit.setPage("1");
         bankUncleardeposit.setAcctno(env.getProperty("BANK.ACCTNO"));
         bankUncleardeposit.setCcycd("01");
-        bankUncleardeposit.setBegdt(bankUncleardeposit.getBegdt().replace("-",""));
-        bankUncleardeposit.setEnddt(bankUncleardeposit.getEnddt().replace("-",""));
+        bankUncleardeposit.setBegdt(bankUncleardeposit.getBegdt().replace("-", ""));
+        bankUncleardeposit.setEnddt(bankUncleardeposit.getEnddt().replace("-", ""));
 
         String rtnxml = postBank(bankUncleardeposit);
 
@@ -114,8 +128,7 @@ public class BankUncleardepositController extends BaseController {
             bankUncleardepositService.insertBankUncleardeposit(bankUncleardeposit);
             update(bankUncleardeposit, rtnxml);
             return AjaxResult.success(rtn);
-        }
-        else return AjaxResult.error(rtn);
+        } else return AjaxResult.error(rtn);
     }
 
 
@@ -141,33 +154,56 @@ public class BankUncleardepositController extends BaseController {
         List<BankUncleardeposit> list = bankUncleardepositService.selectBankUncleardepositList(bankUncleardeposit);
         if (list.isEmpty()) return 0;
         BankUncleardeposit bt = list.get(0);
+        String delid = bt.getUncleardepositid();
+
         bt.setRtnTrnuid(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/TRNUID"));
         bt.setRtnStatus(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/STATUS"));
         bt.setRtnCode(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/STATUS/CODE"));
         bt.setRtnSeverity(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/STATUS/SEVERITY"));
         bt.setRtnMessage(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/STATUS/MESSAGE"));
-        bt.setRtnRsbody(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY"));
+//        bt.setRtnRsbody(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY"));
 
         bt.setRtnRcrdtotnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/RCRDTOTNUM"));
         bt.setRtnCrnpgno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CRNPGNO"));
         bt.setRtnPgrcrdnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/PGRCRDNUM"));
         bt.setRtnTotpgnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/TOTPGNUM"));
-        bt.setRtnContent(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT"));
-        bt.setRtnTradedate(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/TRADEDATE"));
-        bt.setRtnSerialno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/SERIALNO"));
-        bt.setRtnAssetno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/ASSETNO"));
-        bt.setRtnAssetname(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/ASSETNAME"));
-        bt.setRtnOppassetno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/OPPASSETNO"));
-        bt.setRtnOppassetname(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/OPPASSETNAME"));
-        bt.setRtnOppbankno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/OPPBANKNO"));
-        bt.setRtnOppbankname(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/OPPBANKNAME"));
-        bt.setRtnAmt(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/AMT")));
-        bt.setRtnSelfbal(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/SELFBAL")));
-        bt.setRtnSummary(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/SUMMARY"));
-        bt.setRtnAdjustreason(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/ADJUSTREASON"));
-
-
-        return bankUncleardepositService.updateBankUncleardeposit(bt);
+
+        String rsbody = JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY");
+        bt.setRtnRsbody(rsbody);
+        bankUncleardepositService.updateBankUncleardeposit(bt);
+
+        ArrayList<String> contentlist = JsonUtils.findContent(rsbody);
+
+        for (int i = 0; i < contentlist.size(); i++) {
+//            bt.setRtnContent(JsonUtils.findJson(contentlist.get(i), "CONTENT"));
+            bt.setRtnTradedate(JsonUtils.findJson(contentlist.get(i), "TRADEDATE"));
+            bt.setRtnSerialno(JsonUtils.findJson(contentlist.get(i), "SERIALNO"));
+            bt.setRtnAssetno(JsonUtils.findJson(contentlist.get(i), "ASSETNO"));
+            bt.setRtnAssetname(JsonUtils.findJson(contentlist.get(i), "ASSETNAME"));
+            bt.setRtnOppassetno(JsonUtils.findJson(contentlist.get(i), "OPPASSETNO"));
+            bt.setRtnOppassetname(JsonUtils.findJson(contentlist.get(i), "OPPASSETNAME"));
+            bt.setRtnOppbankno(JsonUtils.findJson(contentlist.get(i), "OPPBANKNO"));
+            bt.setRtnOppbankname(JsonUtils.findJson(contentlist.get(i), "OPPBANKNAME"));
+            bt.setRtnAmt(JsonUtils.checkBigDecimal(JsonUtils.findJson(contentlist.get(i), "AMT")));
+            bt.setRtnSelfbal(JsonUtils.checkBigDecimal(JsonUtils.findJson(contentlist.get(i), "SELFBAL")));
+            bt.setRtnSummary(JsonUtils.findJson(contentlist.get(i), "SUMMARY"));
+            bt.setRtnAdjustreason(JsonUtils.findJson(contentlist.get(i), "ADJUSTREASON"));
+
+            BankUncleardeposit query = new BankUncleardeposit();
+            query.setRtnSerialno(JsonUtils.findJson(contentlist.get(i), "SERIALNO"));
+            List<BankUncleardeposit> rlist = bankUncleardepositService.selectBankUncleardepositList(query);
+            String[] ids = rlist.stream().map(BankUncleardeposit::getUncleardepositid).toArray(String[]::new);
+            if (ids.length > 0) bankUncleardepositService.deleteBankUncleardepositByUncleardepositids(ids);
+
+            bt.setUncleardepositid(UUID.randomUUID().toString(true));
+            bankUncleardepositService.insertBankUncleardeposit(bt);
+
+            if (i == (contentlist.size() - 1))
+                bankUncleardepositService.deleteBankUncleardepositByUncleardepositid(delid);
+        }
+
+        if (contentlist.size() < 1) return 0;
+        else return 1;
     }
 
     private String postBank(BankUncleardeposit bankUncleardeposit) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankUncleardepositrfndController.java

@@ -95,25 +95,26 @@ public class BankUncleardepositrfndController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BankUncleardepositrfnd bankUncleardepositrfnd)
     {
-        BankUncleardepositrfnd bt = new BankUncleardepositrfnd();
+        return addBankUncleardepositrfnd(bankUncleardepositrfnd);
+    }
+
+    public AjaxResult addBankUncleardepositrfnd(BankUncleardepositrfnd bankUncleardepositrfnd)
+    {
+
         // 流水号
         String TRNUID = "BMBZJB" + System.currentTimeMillis() + (new Random().nextInt(1000) + 1);
 
-        bt.setUncleardepositrfndid(UUID.randomUUID().toString(true));
-        bt.setTrnuid(TRNUID);
-        bt.setPpid(Long.valueOf(115));
-
-        bt.setSerialno("H00100202206210010977011130000");
-        bt.setTradedate("20240621");
-        bt.setDestbailamt(new BigDecimal("115"));
+        bankUncleardepositrfnd.setUncleardepositrfndid(UUID.randomUUID().toString(true));
+        bankUncleardepositrfnd.setTrnuid(TRNUID);
+//        bankUncleardepositrfnd.setPpid(Long.valueOf(115));
 
-        String rtnxml = postBank(bt);
+        String rtnxml = postBank(bankUncleardepositrfnd);
 
         String rtn = JsonUtils.getStatus(rtnxml);
 
         if (rtn.contains("成功")) {
-            bankUncleardepositrfndService.insertBankUncleardepositrfnd(bt);
-            update(bt, rtnxml);
+            bankUncleardepositrfndService.insertBankUncleardepositrfnd(bankUncleardepositrfnd);
+            update(bankUncleardepositrfnd, rtnxml);
             return AjaxResult.success(rtn);
         }
         else return AjaxResult.error(rtn);
@@ -158,10 +159,10 @@ public class BankUncleardepositrfndController extends BaseController
         bt.setRtnCurrency(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/CURRENCY"));
         bt.setRtnAcctname(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/ACCTNAME"));
         bt.setRtnBankname(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/BANKNAME"));
-        bt.setRtnRefundamt(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/REFUNDAMT")));
+        bt.setRtnRefundamt(JsonUtils.checkBigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/REFUNDAMT")));
         bt.setRtnRemark(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/REMARK"));
 
-        bt.setRtnXferprcsts(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/XFERPRCSTS"));
+//        bt.setRtnXferprcsts(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/XFERPRCSTS"));
         bt.setRtnXferprccode(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/XFERPRCSTS/XFERPRCCODE"));
         bt.setRtnDtxferprc(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/XFERPRCSTS/DTXFERPRC"));
         bt.setRtnMessage(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/XFERPRCSTS/MESSAGE"));

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

@@ -142,15 +142,16 @@ 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) && "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))
+        if ("0".equals(CODE) && !"PAYOUT".equals(XFERPRCCODE)&& !"".equals(XFERPRCCODE))
             return JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/RSBODY/XFERPRCSTS/MESSAGE");
 
+        if (!"0".equals(CODE) && !"".equals(CODE))
+            return JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/STATUS/MESSAGE");
+        if ("0".equals(CODE) && "0".equals(C)) return "处理成功";
+
         return XFERPRCCODE + ":" + JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/RSBODY/XFERPRCSTS/MESSAGE");
     }
 

ruoyi-ui/src/views/bank/uncleardeposit/index.vue

@@ -2,74 +2,10 @@
 	<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-form-item label="流水号" prop="rtnSerialno">
 				<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="处理结果码" prop="rtnCode" v-if="false">
-				<el-input
-					v-model="queryParams.rtnCode"
-					placeholder="请输入处理结果码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="记录总数" prop="rtnRcrdtotnum" v-if="false">
-				<el-input
-					v-model="queryParams.rtnRcrdtotnum"
-					placeholder="请输入记录总数"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="当前页码" prop="rtnCrnpgno" v-if="false">
-				<el-input
-					v-model="queryParams.rtnCrnpgno"
-					placeholder="请输入当前页码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="每页记录数" prop="rtnPgrcrdnum" v-if="false">
-				<el-input
-					v-model="queryParams.rtnPgrcrdnum"
-					placeholder="请输入每页记录数"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="总页数" prop="rtnTotpgnum" v-if="false">
-				<el-input
-					v-model="queryParams.rtnTotpgnum"
-					placeholder="请输入总页数"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="中心账户名" prop="rtnAssetname">
-				<el-input
-					v-model="queryParams.rtnAssetname"
-					placeholder="请输入中心账户名"
+					placeholder="请输入流水号"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -82,7 +18,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="入账账户名" prop="rtnOppassetname">
+			<el-form-item label="入账账户名" prop="rtnOppassetname" label-width="120">
 				<el-input
 					v-model="queryParams.rtnOppassetname"
 					placeholder="请输入入账账户名"
@@ -90,7 +26,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="入账账号行号" prop="rtnOppbankno">
+			<el-form-item label="入账账号行号" prop="rtnOppbankno" label-width="120">
 				<el-input
 					v-model="queryParams.rtnOppbankno"
 					placeholder="请输入入账账号行号"
@@ -116,18 +52,6 @@
 				>查询不明保证金
 				</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:uncleardeposit:edit']"
-				>同步银行数据
-				</el-button>
-			</el-col>
 			<el-col :span="1.5" v-if="false">
 				<el-button
 					type="danger"
@@ -151,35 +75,36 @@
 				>数据导出
 				</el-button>
 			</el-col>
+			<span style="color:red;">单次查询最多返回100结果，建议缩小日期范围查询</span>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
 		<el-table v-loading="loading" :data="uncleardepositList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center"/>
-			<el-table-column label="查询不明保证金明细" align="center" prop="uncleardepositid"/>
-			<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="uncleardepositid" v-if="false"/>
+			<el-table-column label="采购公告" align="center" prop="ppid" v-if="false"/>
+			<el-table-column label="银行流水" align="center" prop="trnuid" v-if="false"/>
 			<el-table-column label="报文节点page查询页码，必输若需跳转到下一页只需修改页码，其他字段不变" align="center"
-							 prop="rqbody"/>
-			<el-table-column label="中心账号" align="center" prop="acctno"/>
-			<el-table-column label="中心币种01-人民币" align="center" prop="ccycd"/>
-			<el-table-column label="开始日期格式：yyyymmdd" align="center" prop="begdt"/>
-			<el-table-column label="结束日期格式：yyyymmdd" align="center" prop="enddt"/>
-			<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="报文节点more是否有下一页，y有，n无" 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="客户基础信息内容循环体报文节点每批最多支持100个" align="center" prop="rtnContent"/>
-			<el-table-column label="交易日期yyyymmdd用于不明保证金退款日期" align="center" prop="rtnTradedate"/>
-			<el-table-column label="流水号用于不明保证金退款流水号" align="center" prop="rtnSerialno"/>
-			<el-table-column label="中心账号" align="center" prop="rtnAssetno"/>
-			<el-table-column label="中心账户名" align="center" prop="rtnAssetname"/>
+							 prop="rqbody" v-if="false"/>
+			<el-table-column label="中心账号" align="center" prop="acctno" v-if="false"/>
+			<el-table-column label="中心币种01-人民币" align="center" prop="ccycd" v-if="false"/>
+			<el-table-column label="开始日期格式：yyyymmdd" align="center" prop="begdt" v-if="false"/>
+			<el-table-column label="结束日期格式：yyyymmdd" align="center" prop="enddt" v-if="false"/>
+			<el-table-column label="银行流水" align="center" prop="rtnTrnuid" v-if="false"/>
+			<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="处理结果等级(info/warn/error)" align="center" prop="rtnSeverity" v-if="false"/>
+			<el-table-column label="处理信息描述" align="center" prop="rtnMessage" v-if="false"/>
+			<el-table-column label="报文节点more是否有下一页，y有，n无" 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="客户基础信息内容循环体报文节点每批最多支持100个" align="center" prop="rtnContent" v-if="false"/>
+			<el-table-column label="交易日期(用于不明保证金退款日期)" align="center" prop="rtnTradedate"/>
+			<el-table-column label="流水号(用于不明保证金退款流水号)" align="center" prop="rtnSerialno"/>
+			<el-table-column label="中心账号" align="center" prop="rtnAssetno" v-if="false"/>
+			<el-table-column label="中心账户名" align="center" prop="rtnAssetname" v-if="false"/>
 			<el-table-column label="入账账号" align="center" prop="rtnOppassetno"/>
 			<el-table-column label="入账账户名" align="center" prop="rtnOppassetname"/>
 			<el-table-column label="入账账号行号" align="center" prop="rtnOppbankno"/>
@@ -196,8 +121,7 @@
 						icon="el-icon-edit"
 						@click="handleUpdate(scope.row)"
 						v-hasPermi="['bank:uncleardeposit:edit']"
-					>修改
-					</el-button>
+					>退还保证金</el-button>
 					<el-button
 						size="mini"
 						type="text"
@@ -419,12 +343,6 @@ export default {
 			this.$refs["form"].validate(valid => {
 				if (valid) {
 					if ((this.form.begdt != null) && (this.form.enddt != null)) {
-						updateUncleardeposit(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
 						addUncleardeposit(this.form).then(response => {
 							this.$modal.msgSuccess("新增成功");
 							this.open = false;

ruoyi-ui/src/views/bank/uncleardepositrfnd/index.vue

@@ -1,543 +1,444 @@
 <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="原入账流水号“。" prop="serialno">
-        <el-input
-          v-model="queryParams.serialno"
-          placeholder="请输入原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="原入账会计日期" prop="tradedate">
-        <el-input
-          v-model="queryParams.tradedate"
-          placeholder="请输入原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退款金额" prop="destbailamt">
-        <el-input
-          v-model="queryParams.destbailamt"
-          placeholder="请输入退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="交易唯一标志" prop="rtnTrnuid">
-        <el-input
-          v-model="queryParams.rtnTrnuid"
-          placeholder="请输入客户端交易的唯一标志"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="处理结果码" prop="rtnCode">
-        <el-input
-          v-model="queryParams.rtnCode"
-          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="rtnSgtno">
-        <el-input
-          v-model="queryParams.rtnSgtno"
-          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="rtnTenderid">
-        <el-input
-          v-model="queryParams.rtnTenderid"
-          placeholder="请输入投标编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退款时收款户名" prop="rtnAcctname">
-        <el-input
-          v-model="queryParams.rtnAcctname"
-          placeholder="请输入退款时收款户名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退款时收款行号" prop="rtnBankname">
-        <el-input
-          v-model="queryParams.rtnBankname"
-          placeholder="请输入退款时收款行号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退还金额" prop="rtnRefundamt">
-        <el-input
-          v-model="queryParams.rtnRefundamt"
-          placeholder="请输入退还金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="rtnRemark">
-        <el-input
-          v-model="queryParams.rtnRemark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="指令处理状态报文节点" prop="rtnXferprcsts">
-        <el-input
-          v-model="queryParams.rtnXferprcsts"
-          placeholder="请输入指令处理状态报文节点"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="指令状态编码" prop="rtnXferprccode">
-        <el-input
-          v-model="queryParams.rtnXferprccode"
-          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="serialno" label-width="120">
+				<el-input
+					v-model="queryParams.serialno"
+					placeholder="请输入原入账交易流水号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="原入账会计日期" prop="tradedate" label-width="120">
+				<el-input
+					v-model="queryParams.tradedate"
+					placeholder="请输入原入账会计日期"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="退款时收款户名" prop="rtnAcctname" label-width="120">
+				<el-input
+					v-model="queryParams.rtnAcctname"
+					placeholder="请输入退款时收款户名"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="退款时收款行号" prop="rtnBankname" label-width="120">
+				<el-input
+					v-model="queryParams.rtnBankname"
+					placeholder="请输入退款时收款行号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="退还金额" prop="rtnRefundamt">
+				<el-input
+					v-model="queryParams.rtnRefundamt"
+					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:uncleardepositrfnd: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:uncleardepositrfnd: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:uncleardepositrfnd: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:uncleardepositrfnd: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="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['bank:uncleardepositrfnd:export']"
+				>导出
+				</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
 
-    <el-table v-loading="loading" :data="uncleardepositrfndList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="不明保证金退款申请id" align="center" prop="uncleardepositrfndid" />
-      <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="原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。" align="center" prop="serialno" />
-      <el-table-column label="原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”" align="center" prop="tradedate" />
-      <el-table-column label="退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。" align="center" prop="destbailamt" />
-      <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="rtnRsbody" />
-      <el-table-column label="项目编号" align="center" prop="rtnPrjno" />
-      <el-table-column label="标段编号" align="center" prop="rtnSgtno" />
-      <el-table-column label="退款状态tbsp_success-执行成功tbsp_fail-执行失败tbsp_process-处理中" align="center" prop="rtnRecordstate" />
-      <el-table-column label="标段id" align="center" prop="rtnSgtid" />
-      <el-table-column label="投标编号" align="center" prop="rtnTenderid" />
-      <el-table-column label="退还方式general_bail-一般保证金keep_bail-长期保证金cash_bail-现金guarantee_bail-保函" align="center" prop="rtnRefundflag" />
-      <el-table-column label="退款方式principal-本金退还" align="center" prop="rtnRefundtype" />
-      <el-table-column label="退款时收款账号" align="center" prop="rtnAcctid" />
-      <el-table-column label="退款时收款币种" align="center" prop="rtnCurrency" />
-      <el-table-column label="退款时收款户名" align="center" prop="rtnAcctname" />
-      <el-table-column label="退款时收款行号" align="center" prop="rtnBankname" />
-      <el-table-column label="退还金额" align="center" prop="rtnRefundamt" />
-      <el-table-column label="备注" align="center" prop="rtnRemark" />
-      <el-table-column label="指令处理状态报文节点" align="center" prop="rtnXferprcsts" />
-      <el-table-column label="指令状态编码" align="center" prop="rtnXferprccode" />
-      <el-table-column label="指令处理时间yyyymmdd hhmmss" align="center" prop="rtnDtxferprc" />
-      <el-table-column label="指令处理信息" align="center" prop="rtnMessage" />
-      <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:uncleardepositrfnd:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['bank:uncleardepositrfnd:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+		<el-table v-loading="loading" :data="uncleardepositrfndList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center"/>
+			<el-table-column label="不明保证金退款申请id" align="center" prop="uncleardepositrfndid" v-if="false"/>
+			<el-table-column label="采购计划id" align="center" prop="ppid" v-if="false"/>
+			<el-table-column label="客户端交易的唯一流水号建议值为yyyymmdd+序号" align="center" prop="trnuid"
+							 v-if="false"/>
+			<el-table-column label="报文节点" align="center" prop="rqbody" v-if="false"/>
+			<el-table-column label="原入账交易流水号" align="center" prop="serialno" width="160"/>
+			<el-table-column label="原入账会计日期" align="center" prop="tradedate"/>
+			<el-table-column label="退款金额" align="center" prop="destbailamt"/>
+			<el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid" v-if="false"/>
+			<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="处理结果等级(info/warn/error)" align="center" prop="rtnSeverity" v-if="false"/>
+			<el-table-column label="报文节点" align="center" prop="rtnRsbody" v-if="false"/>
+			<el-table-column label="项目编号" align="center" prop="rtnPrjno" v-if="false"/>
+			<el-table-column label="标段编号" align="center" prop="rtnSgtno" v-if="false"/>
+			<el-table-column label="退款状态" align="center"
+							 prop="rtnRecordstate">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnRecordstate.toLowerCase()==='tbsp_success' ">执行成功</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnRecordstate.toLowerCase()==='tbsp_fail' ">执行失败</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnRecordstate.toLowerCase()==='tbsp_process' ">处理中</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="标段id" align="center" prop="rtnSgtid" v-if="false"/>
+			<el-table-column label="投标编号" align="center" prop="rtnTenderid" width="160"/>
+			<el-table-column
+				label="退还方式"
+				align="center" prop="rtnRefundflag">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnRefundflag.toLowerCase()==='general_bail' ">一般保证金</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnRefundflag.toLowerCase()==='keep_bail' ">长期保证金</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnRefundflag.toLowerCase()==='cash_bail' ">现金</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnRefundflag.toLowerCase()==='guarantee_bail' ">保函</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="退款方式" align="center" prop="rtnRefundtype">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnRefundtype.toLowerCase()==='principal' ">本金退还</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="退款时收款账号" align="center" prop="rtnAcctid"/>
+			<el-table-column label="退款时收款币种" align="center" prop="rtnCurrency"/>
+			<el-table-column label="退款时收款户名" align="center" prop="rtnAcctname"/>
+			<el-table-column label="退款时收款行号" align="center" prop="rtnBankname"/>
+			<el-table-column label="退还金额" align="center" prop="rtnRefundamt"/>
+			<el-table-column label="备注" align="center" prop="rtnRemark"/>
+			<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"/>
+			<el-table-column label="指令处理信息" align="center" prop="rtnMessage"/>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="80">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['bank:uncleardepositrfnd: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="原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。" prop="serialno">
-          <el-input v-model="form.serialno" placeholder="请输入原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。" />
-        </el-form-item>
-        <el-form-item label="原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”" prop="tradedate">
-          <el-input v-model="form.tradedate" placeholder="请输入原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”" />
-        </el-form-item>
-        <el-form-item label="退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。" prop="destbailamt">
-          <el-input v-model="form.destbailamt" placeholder="请输入退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。" />
-        </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="rtnRsbody">
-          <el-input v-model="form.rtnRsbody" 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="退款状态tbsp_success-执行成功tbsp_fail-执行失败tbsp_process-处理中" prop="rtnRecordstate">
-          <el-input v-model="form.rtnRecordstate" placeholder="请输入退款状态tbsp_success-执行成功tbsp_fail-执行失败tbsp_process-处理中" />
-        </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="投标编号" prop="rtnTenderid">
-          <el-input v-model="form.rtnTenderid" placeholder="请输入投标编号" />
-        </el-form-item>
-        <el-form-item label="退还方式general_bail-一般保证金keep_bail-长期保证金cash_bail-现金guarantee_bail-保函" prop="rtnRefundflag">
-          <el-input v-model="form.rtnRefundflag" placeholder="请输入退还方式general_bail-一般保证金keep_bail-长期保证金cash_bail-现金guarantee_bail-保函" />
-        </el-form-item>
-        <el-form-item label="退款时收款账号" prop="rtnAcctid">
-          <el-input v-model="form.rtnAcctid" placeholder="请输入退款时收款账号" />
-        </el-form-item>
-        <el-form-item label="退款时收款币种" prop="rtnCurrency">
-          <el-input v-model="form.rtnCurrency" placeholder="请输入退款时收款币种" />
-        </el-form-item>
-        <el-form-item label="退款时收款户名" prop="rtnAcctname">
-          <el-input v-model="form.rtnAcctname" placeholder="请输入退款时收款户名" />
-        </el-form-item>
-        <el-form-item label="退款时收款行号" prop="rtnBankname">
-          <el-input v-model="form.rtnBankname" placeholder="请输入退款时收款行号" />
-        </el-form-item>
-        <el-form-item label="退还金额" prop="rtnRefundamt">
-          <el-input v-model="form.rtnRefundamt" placeholder="请输入退还金额" />
-        </el-form-item>
-        <el-form-item label="备注" prop="rtnRemark">
-          <el-input v-model="form.rtnRemark" placeholder="请输入备注" />
-        </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-item label="指令处理信息" prop="rtnMessage">
-          <el-input v-model="form.rtnMessage" type="textarea" 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="原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。"
+							  prop="serialno">
+					<el-input v-model="form.serialno"
+							  placeholder="请输入原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。"/>
+				</el-form-item>
+				<el-form-item
+					label="原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”"
+					prop="tradedate">
+					<el-input v-model="form.tradedate"
+							  placeholder="请输入原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”"/>
+				</el-form-item>
+				<el-form-item
+					label="退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。"
+					prop="destbailamt">
+					<el-input v-model="form.destbailamt"
+							  placeholder="请输入退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。"/>
+				</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="rtnRsbody">
+					<el-input v-model="form.rtnRsbody" 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="退款状态tbsp_success-执行成功tbsp_fail-执行失败tbsp_process-处理中"
+							  prop="rtnRecordstate">
+					<el-input v-model="form.rtnRecordstate"
+							  placeholder="请输入退款状态tbsp_success-执行成功tbsp_fail-执行失败tbsp_process-处理中"/>
+				</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="投标编号" prop="rtnTenderid">
+					<el-input v-model="form.rtnTenderid" placeholder="请输入投标编号"/>
+				</el-form-item>
+				<el-form-item
+					label="退还方式general_bail-一般保证金keep_bail-长期保证金cash_bail-现金guarantee_bail-保函"
+					prop="rtnRefundflag">
+					<el-input v-model="form.rtnRefundflag"
+							  placeholder="请输入退还方式general_bail-一般保证金keep_bail-长期保证金cash_bail-现金guarantee_bail-保函"/>
+				</el-form-item>
+				<el-form-item label="退款时收款账号" prop="rtnAcctid">
+					<el-input v-model="form.rtnAcctid" placeholder="请输入退款时收款账号"/>
+				</el-form-item>
+				<el-form-item label="退款时收款币种" prop="rtnCurrency">
+					<el-input v-model="form.rtnCurrency" placeholder="请输入退款时收款币种"/>
+				</el-form-item>
+				<el-form-item label="退款时收款户名" prop="rtnAcctname">
+					<el-input v-model="form.rtnAcctname" placeholder="请输入退款时收款户名"/>
+				</el-form-item>
+				<el-form-item label="退款时收款行号" prop="rtnBankname">
+					<el-input v-model="form.rtnBankname" placeholder="请输入退款时收款行号"/>
+				</el-form-item>
+				<el-form-item label="退还金额" prop="rtnRefundamt">
+					<el-input v-model="form.rtnRefundamt" placeholder="请输入退还金额"/>
+				</el-form-item>
+				<el-form-item label="备注" prop="rtnRemark">
+					<el-input v-model="form.rtnRemark" placeholder="请输入备注"/>
+				</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-item label="指令处理信息" prop="rtnMessage">
+					<el-input v-model="form.rtnMessage" type="textarea" 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 { listUncleardepositrfnd, getUncleardepositrfnd, delUncleardepositrfnd, addUncleardepositrfnd, updateUncleardepositrfnd } from "@/api/bank/uncleardepositrfnd";
+import {
+	listUncleardepositrfnd,
+	getUncleardepositrfnd,
+	delUncleardepositrfnd,
+	addUncleardepositrfnd,
+	updateUncleardepositrfnd
+} from "@/api/bank/uncleardepositrfnd";
 
 export default {
-  name: "Uncleardepositrfnd",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 不明保证金退款申请表格数据
-      uncleardepositrfndList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        ppid: null,
-        trnuid: null,
-        rqbody: null,
-        serialno: null,
-        tradedate: null,
-        destbailamt: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnRsbody: null,
-        rtnPrjno: null,
-        rtnSgtno: null,
-        rtnRecordstate: null,
-        rtnSgtid: null,
-        rtnTenderid: null,
-        rtnRefundflag: null,
-        rtnRefundtype: null,
-        rtnAcctid: null,
-        rtnCurrency: null,
-        rtnAcctname: null,
-        rtnBankname: null,
-        rtnRefundamt: null,
-        rtnRemark: null,
-        rtnXferprcsts: null,
-        rtnXferprccode: null,
-        rtnDtxferprc: null,
-        rtnMessage: 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;
-      listUncleardepositrfnd(this.queryParams).then(response => {
-        this.uncleardepositrfndList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        uncleardepositrfndid: null,
-        ppid: null,
-        trnuid: null,
-        rqbody: null,
-        serialno: null,
-        tradedate: null,
-        destbailamt: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnRsbody: null,
-        rtnPrjno: null,
-        rtnSgtno: null,
-        rtnRecordstate: null,
-        rtnSgtid: null,
-        rtnTenderid: null,
-        rtnRefundflag: null,
-        rtnRefundtype: null,
-        rtnAcctid: null,
-        rtnCurrency: null,
-        rtnAcctname: null,
-        rtnBankname: null,
-        rtnRefundamt: null,
-        rtnRemark: null,
-        rtnXferprcsts: null,
-        rtnXferprccode: null,
-        rtnDtxferprc: null,
-        rtnMessage: 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.uncleardepositrfndid)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加不明保证金退款申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const uncleardepositrfndid = row.uncleardepositrfndid || this.ids
-      getUncleardepositrfnd(uncleardepositrfndid).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改不明保证金退款申请";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.uncleardepositrfndid != null) {
-            updateUncleardepositrfnd(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addUncleardepositrfnd(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const uncleardepositrfndids = row.uncleardepositrfndid || this.ids;
-      this.$modal.confirm('是否确认删除不明保证金退款申请编号为"' + uncleardepositrfndids + '"的数据项？').then(function() {
-        return delUncleardepositrfnd(uncleardepositrfndids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('bank/uncleardepositrfnd/export', {
-        ...this.queryParams
-      }, `uncleardepositrfnd_${new Date().getTime()}.xlsx`)
-    }
-  }
+	name: "Uncleardepositrfnd",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 不明保证金退款申请表格数据
+			uncleardepositrfndList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				ppid: null,
+				trnuid: null,
+				rqbody: null,
+				serialno: null,
+				tradedate: null,
+				destbailamt: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnRsbody: null,
+				rtnPrjno: null,
+				rtnSgtno: null,
+				rtnRecordstate: null,
+				rtnSgtid: null,
+				rtnTenderid: null,
+				rtnRefundflag: null,
+				rtnRefundtype: null,
+				rtnAcctid: null,
+				rtnCurrency: null,
+				rtnAcctname: null,
+				rtnBankname: null,
+				rtnRefundamt: null,
+				rtnRemark: null,
+				rtnXferprcsts: null,
+				rtnXferprccode: null,
+				rtnDtxferprc: null,
+				rtnMessage: 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;
+			listUncleardepositrfnd(this.queryParams).then(response => {
+				this.uncleardepositrfndList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				uncleardepositrfndid: null,
+				ppid: null,
+				trnuid: null,
+				rqbody: null,
+				serialno: null,
+				tradedate: null,
+				destbailamt: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnRsbody: null,
+				rtnPrjno: null,
+				rtnSgtno: null,
+				rtnRecordstate: null,
+				rtnSgtid: null,
+				rtnTenderid: null,
+				rtnRefundflag: null,
+				rtnRefundtype: null,
+				rtnAcctid: null,
+				rtnCurrency: null,
+				rtnAcctname: null,
+				rtnBankname: null,
+				rtnRefundamt: null,
+				rtnRemark: null,
+				rtnXferprcsts: null,
+				rtnXferprccode: null,
+				rtnDtxferprc: null,
+				rtnMessage: 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.uncleardepositrfndid)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加不明保证金退款申请";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const uncleardepositrfndid = row.uncleardepositrfndid || this.ids
+			getUncleardepositrfnd(uncleardepositrfndid).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改不明保证金退款申请";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.uncleardepositrfndid != null) {
+						updateUncleardepositrfnd(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addUncleardepositrfnd(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const uncleardepositrfndids = row.uncleardepositrfndid || this.ids;
+			this.$modal.confirm('是否确认删除不明保证金退款申请编号为"' + uncleardepositrfndids + '"的数据项？').then(function () {
+				return delUncleardepositrfnd(uncleardepositrfndids);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('bank/uncleardepositrfnd/export', {
+				...this.queryParams
+			}, `uncleardepositrfnd_${new Date().getTime()}.xlsx`)
+		}
+	}
 };
 </script>