标段发布和标段查询

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteTenderpubService.java

@@ -26,6 +26,6 @@ public interface RemoteTenderpubService {
     @PutMapping(value="/tenderpub")
     public int editInnerAuth(@RequestBody BankTenderpub bankTenderpub, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
-    @DeleteMapping("/{tenderpubids}")
+    @DeleteMapping("/removeInnerAuth/{tenderpubids}")
     public int remove(@RequestParam("tenderpubids") String[] tenderpubids, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidNoticeController.java

@@ -198,38 +198,37 @@ public class BidNoticeController extends BaseController {
         }
 
         /**添加标段银行接口*/
-//        BidTender bt = bidTenderService.selectBidTenderBySid(bidNotice.getSid());
-//        if (bt == null) return error("招标项目不可用！");
-//        PpmProcurementPlan ppp = remotePlanService.getPlan(bt.getXyId(), SecurityConstants.INNER);
-//
-//        BankTenderpub btp = new BankTenderpub();
-//
-//        btp.setPpid(bt.getSid());
-//        btp.setPrjno(bt.getsCode());
-//        btp.setSgtno("BD" + DateUtils.dateTimeNow());
-//        btp.setSgtnm(bt.getsName());
-//
-//        btp.setMrgnamt(BigDecimal.valueOf(ppp.getEarnestMoney()));
-//
-//        btp.setStrtsgtdt(DateUtils.parseDateToStr("yyyyMMdd", bidNotice.getuGetTime()));    //发标日期
-//
-//        /** 保证金截至时间为开标时间前一小时 **/
-//        Calendar c = Calendar.getInstance();
-//        c.setTime(bidNotice.getuKaiTime());
-//        c.add(Calendar.HOUR_OF_DAY, -1);
-//        btp.setMrgnduestopdt(DateUtils.parseDateToStr("yyyyMMdd", c.getTime()));   //保证金缴纳截至日期
-//        btp.setMrgnduestoptm(DateUtils.parseDateToStr("HHmmss", c.getTime()));     //保证金缴纳截至时间
-//        btp.setOpntdrdt(DateUtils.parseDateToStr("yyyyMMdd", bidNotice.getuKaiTime()));        //开标日期
-//        btp.setOpntdrtm(DateUtils.parseDateToStr("HHmmss", bidNotice.getuKaiTime()));          //开标时间
-//
-//        R<String> s = remoteTenderpubService.addInnerAuth(btp, SecurityConstants.INNER);
-//
-//        if (s.getMsg().contains("成功"))
-//            return toAjax(bidNoticeService.insertBidNotice(bidNotice));
-//        else
-//            return error(s.getMsg());
-
-        return toAjax(bidNoticeService.insertBidNotice(bidNotice));
+        BidTender bt = bidTenderService.selectBidTenderBySid(bidNotice.getSid());
+        if (bt == null) return error("招标项目不可用！");
+        PpmProcurementPlan ppp = remotePlanService.getPlan(bt.getXyId(), SecurityConstants.INNER);
+
+        BankTenderpub btp = new BankTenderpub();
+
+        btp.setPpid(bt.getSid());
+        btp.setPrjno(bt.getsCode());
+        btp.setSgtno("BD" + DateUtils.dateTimeNow());
+        btp.setSgtnm(bt.getsName());
+
+        btp.setMrgnamt(BigDecimal.valueOf(ppp.getEarnestMoney()));
+
+        btp.setStrtsgtdt(DateUtils.parseDateToStr("yyyyMMdd", bidNotice.getuGetTime()));    //发标日期
+
+        /** 保证金截至时间为开标时间前一小时 **/
+        Calendar c = Calendar.getInstance();
+        c.setTime(bidNotice.getuKaiTime());
+        c.add(Calendar.HOUR_OF_DAY, -1);
+        btp.setMrgnduestopdt(DateUtils.parseDateToStr("yyyyMMdd", c.getTime()));   //保证金缴纳截至日期
+        btp.setMrgnduestoptm(DateUtils.parseDateToStr("HHmmss", c.getTime()));     //保证金缴纳截至时间
+        btp.setOpntdrdt(DateUtils.parseDateToStr("yyyyMMdd", bidNotice.getuKaiTime()));        //开标日期
+        btp.setOpntdrtm(DateUtils.parseDateToStr("HHmmss", bidNotice.getuKaiTime()));          //开标时间
+
+        R<String> s = remoteTenderpubService.addInnerAuth(btp, SecurityConstants.INNER);
+
+        if (s.getMsg().contains("成功"))
+            return toAjax(bidNoticeService.insertBidNotice(bidNotice));
+        else
+            return error(s.getMsg());
+
     }
 
     /**

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

@@ -2,15 +2,12 @@ package com.ruoyi.mast.bank.controller;
 
 import java.math.BigDecimal;
 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.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;
@@ -45,9 +42,6 @@ public class BankDepositdescController extends BaseController {
     @Autowired
     private IBankDepositdescService bankDepositdescService;
 
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 
@@ -90,12 +84,16 @@ public class BankDepositdescController extends BaseController {
     @Log(title = "查询保证金入账明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankDepositdesc bankDepositdesc) {
-        BankDepositdesc bdd = new BankDepositdesc();
+        return addBankDepositdesc(bankDepositdesc);
+    }
+
+    public AjaxResult addBankDepositdesc(BankDepositdesc bdd) {
         // 流水号
         String TRNUID = "BZJD" + System.currentTimeMillis() + (new Random().nextInt(1000) + 1);
 
         bdd.setDepositdescid(UUID.randomUUID().toString(true));
         bdd.setTrnuid(TRNUID);
+
         bdd.setPpid(Long.valueOf(115));
         bdd.setSgtid("0cd87fb3e9314f43a0e7240380a30cec");
         bdd.setSgtno("BD202408281514");

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

@@ -7,6 +7,8 @@ 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.BankTenderquery;
+import com.ruoyi.mast.bank.service.IBankTenderqueryService;
 import com.ruoyi.mast.bank.utils.JsonUtils;
 import com.ruoyi.system.api.RemotePlanService;
 import kong.unirest.core.HttpResponse;
@@ -44,6 +46,12 @@ public class BankTenderpubController extends BaseController {
     @Autowired
     private IBankTenderpubService bankTenderpubService;
 
+    @Autowired
+    private BankTenderqueryController bankTenderqueryController;
+
+    @Autowired
+    private IBankTenderqueryService bankTenderqueryService;
+
     @Autowired
     private RemotePlanService remotePlanService;
 
@@ -95,6 +103,7 @@ public class BankTenderpubController extends BaseController {
      * @return
      */
     @InnerAuth
+    @Transactional
     @Log(title = "标段发布InnerAuth", businessType = BusinessType.INSERT)
     @PostMapping("/addInnerAuth")
     public AjaxResult addInnerAuth(@RequestBody BankTenderpub bankTenderpub) {
@@ -106,7 +115,7 @@ public class BankTenderpubController extends BaseController {
      * web 接口
      */
     @Transactional
-//    @RequiresPermissions("bank:tenderpub:add")
+    @RequiresPermissions("bank:tenderpub:add")
     @Log(title = "标段发布", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankTenderpub bankTenderpub) {
@@ -129,8 +138,22 @@ public class BankTenderpubController extends BaseController {
 
         if (rtn.contains("成功")) {
             bankTenderpubService.insertBankTenderpub(bankTenderpub);
-            update(bankTenderpub, rtnxml);
-            return AjaxResult.success(rtn);
+            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()){
+                    return success("调取银行接口成功");
+                }else{
+                    return error("调取银行接口失败");
+                }
+            }
+            else
+                return error("调取银行接口失败");
         }
         else return AjaxResult.error(rtn);
     }
@@ -151,7 +174,7 @@ public class BankTenderpubController extends BaseController {
      * 修改标段发布
      * 同步数据
      */
-//    @RequiresPermissions("bank:tenderpub:edit")
+    @RequiresPermissions("bank:tenderpub:edit")
     @Log(title = "标段修改", businessType = BusinessType.UPDATE)
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody BankTenderpub bankTenderpub) {
@@ -166,6 +189,7 @@ public class BankTenderpubController extends BaseController {
         if (rtn.contains("成功")) {
             return toAjax(update(bt, rtnxml));
         }else if(rtn.contains("流水号TRNUID值已被使用")){
+            // 调用标段信息查询，更新本条记录
             return error(rtn);
         }else{
             return error(rtn);
@@ -256,7 +280,7 @@ public class BankTenderpubController extends BaseController {
      */
     @InnerAuth
     @Log(title = "标段发布", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @DeleteMapping("/removeInnerAuth/{ids}")
     public AjaxResult removeInnerAuth(@PathVariable String[] ids){
         return remove(ids);
     }

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

@@ -60,28 +60,29 @@ public class BankTenderqueryController extends BaseController {
     public TableDataInfo list(BankTenderquery bankTenderquery) throws Exception {
         startPage();
         List<BankTenderquery> list = bankTenderqueryService.selectBankTenderqueryList(bankTenderquery);
-
-        List<Long> ppidlist = list.stream().map(BankTenderquery::getPpid).collect(Collectors.toList());
-
-        Integer[] aids = new Integer[ppidlist.size()];
-
-        for (int i = 0; i < ppidlist.size(); i++) {
-            aids[i] = Integer.valueOf(ppidlist.get(i).toString());
-        }
-
-        List<PpmProcurementPlan> plist = remotePlanService.selectPlanByids(aids, SecurityConstants.INNER);
-
-        if(plist.isEmpty()) return getDataTable(list);
-
-        List objs = new ArrayList();
-
-        for (BankTenderquery bt : list) {
-            String ppnm = plist.stream().filter(p->p.getAid().equals(bt.getPpid())).collect(Collectors.toList()).get(0).getaName();
-            bt.setPpnm(ppnm);       //采购计划名
-            objs.add(bt);
-        }
-
-        return getDataTable(objs);
+        return getDataTable(list);
+//
+//        List<Long> ppidlist = list.stream().map(BankTenderquery::getPpid).collect(Collectors.toList());
+//
+//        Integer[] aids = new Integer[ppidlist.size()];
+//
+//        for (int i = 0; i < ppidlist.size(); i++) {
+//            aids[i] = Integer.valueOf(ppidlist.get(i).toString());
+//        }
+//
+//        List<PpmProcurementPlan> plist = remotePlanService.selectPlanByids(aids, SecurityConstants.INNER);
+//
+//        if(plist.isEmpty()) return getDataTable(list);
+//
+//        List objs = new ArrayList();
+//
+//        for (BankTenderquery bt : list) {
+//            String ppnm = plist.stream().filter(p->p.getAid().equals(bt.getPpid())).collect(Collectors.toList()).get(0).getaName();
+//            bt.setPpnm(ppnm);       //采购计划名
+//            objs.add(bt);
+//        }
+//
+//        return getDataTable(objs);
     }
 
     /**
@@ -112,34 +113,7 @@ public class BankTenderqueryController extends BaseController {
     @Log(title = "标段信息查询", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankTenderquery bankTenderquery) {
-        BankTenderquery bt = new BankTenderquery();
-        // 流水号
-        String TRNUID = "BDQ" + System.currentTimeMillis() + (new Random().nextInt(1000) + 1);
-
-        bt.setTenderqueryid(UUID.randomUUID().toString(true));
-        bt.setTrnuid(TRNUID);
-        bt.setPpid(Long.valueOf(115));
-
-        bt.setSgtid("");
-        bt.setAcctno("117010100102244796");
-        bt.setPrjno("321432178911");
-        bt.setSgtno("BD2024082811531");
-        bt.setPltfmcstno("");
-
-        bt.setPpid(Long.valueOf(111));     //采购计划id
-        bt.setSgtid("");
-        bt.setPltfmcstno("");
-
-        String rtnxml = postBank(bt);
-
-        String rtn = JsonUtils.getStatus(rtnxml);
-
-        if (rtn.contains("成功")) {
-            bankTenderqueryService.insertBankTenderquery(bt);
-            update(bt, rtnxml);
-            return AjaxResult.success(rtn);
-        }
-        else return AjaxResult.error(rtn);
+        return addBankTenderquery(bankTenderquery);
     }
 
     /**
@@ -159,6 +133,33 @@ public class BankTenderqueryController extends BaseController {
         return toAjax(update(bt, rtnxml));
     }
 
+    public AjaxResult addBankTenderquery(BankTenderquery bankTenderquery){
+//        BankTenderquery bt = new BankTenderquery();
+        // 流水号
+        String TRNUID = "BDQ" + System.currentTimeMillis() + (new Random().nextInt(1000) + 1);
+
+        bankTenderquery.setTenderqueryid(UUID.randomUUID().toString(true));
+        bankTenderquery.setTrnuid(TRNUID);
+//        bankTenderquery.setPpid(Long.valueOf(115));
+
+//        bt.setSgtid("");
+//        bt.setAcctno("117010100102244796");
+//        bt.setPrjno("321432178911");
+//        bt.setSgtno("BD2024082811531");
+//        bt.setPltfmcstno("");
+
+        String rtnxml = postBank(bankTenderquery);
+
+        String rtn = JsonUtils.getStatus(rtnxml);
+
+        if (rtn.contains("成功")) {
+            bankTenderqueryService.insertBankTenderquery(bankTenderquery);
+            update(bankTenderquery, rtnxml);
+            return AjaxResult.success(rtn);
+        }
+        else return AjaxResult.error(rtn);
+    }
+
     private int update(BankTenderquery bankTenderquery, String rtnxml) {
 
         List<BankTenderquery> list = bankTenderqueryService.selectBankTenderqueryList(bankTenderquery);
@@ -221,7 +222,7 @@ public class BankTenderqueryController extends BaseController {
                 "        <QUERYTENDERINFOTRNRQ>\n" +
                 "            <TRNUID>" + bankTenderquery.getTrnuid() + "</TRNUID>\n" +
                 "            <RQBODY>\n" +
-                "                <SGTID>" + bankTenderquery.getRtnSgtid() + "</SGTID>\n" +
+                "                <SGTID>" + bankTenderquery.getSgtid() + "</SGTID>\n" +
                 "            </RQBODY>\n" +
                 "        </QUERYTENDERINFOTRNRQ>\n" +
                 "    </SECURITIES_MSGSRQV1>\n" +

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

@@ -2,7 +2,11 @@ package com.ruoyi.mast.bank.utils;
 
 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.util.ArrayList;
 import java.util.Arrays;
 
@@ -57,6 +61,20 @@ public class JsonUtils {
         return "";
     }
 
+    /**
+     * 检查是否为xml字符串
+     * @param xml
+     * @return
+     */
+    public static boolean checkXml(String xml){
+        try{
+            DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(xml)));
+            return true;
+        }catch (Exception e){
+            return false;
+        }
+    }
+
     /**
      * 返回交易状态代码和结果
      *
@@ -64,17 +82,23 @@ public class JsonUtils {
      * @return
      */
     public static String getStatus(String 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");
+
         String C = JsonUtils.findXML(xml, "FOX/SIGNONMSGSRSV1/SONRS/STATUS/CODE");
         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) && !"".equals(CODE))
-            return JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/STATUS/MESSAGE");
         if ("0".equals(CODE) && "PAYOUT".equals(XFERPRCCODE)) return "交易成功";
-        if ("0".equals(CODE) && "0".equals(C)) return "处理成功";
+        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");
     }
 }

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

@@ -104,7 +104,11 @@
       <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" @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)"

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

@@ -1,506 +1,566 @@
 <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>
+	<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="标段id" prop="sgtid" v-if="false">
-        <el-input v-model="queryParams.sgtid" placeholder="请输入标段id" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+			<el-form-item label="标段id" prop="sgtid" v-if="false">
+				<el-input v-model="queryParams.sgtid" placeholder="请输入标段id" clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
 
-      <el-form-item label="产品编号" prop="rtnPdno">
-        <el-input v-model="queryParams.rtnPdno" placeholder="请输入产品编号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+			<el-form-item label="产品编号" prop="rtnPdno">
+				<el-input v-model="queryParams.rtnPdno" 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="标段id" prop="rtnSgtid">
-        <el-input v-model="queryParams.rtnSgtid" placeholder="请输入标段id" 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="rtnPrjno">
+				<el-input v-model="queryParams.rtnPrjno" 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="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="rtnSgtacctno">
-        <el-input v-model="queryParams.rtnSgtacctno" placeholder="请输入标段账号" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
+			<el-form-item label="标段账号" prop="rtnSgtacctno">
+				<el-input v-model="queryParams.rtnSgtacctno" placeholder="请输入标段账号" clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
 
-      <el-form-item label="核心客户" prop="rtnPltfmcstno">
-        <el-input v-model="queryParams.rtnPltfmcstno" placeholder="请输入核心客户号" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="标段状态" prop="rtnSgtst">
-        <el-input v-model="queryParams.rtnSgtst" placeholder="请输入标段状态0-已发标1-已截标2-已开标3-已流标" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
+			<el-form-item label="核心客户" prop="rtnPltfmcstno">
+				<el-input v-model="queryParams.rtnPltfmcstno" placeholder="请输入核心客户号" clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
+			<el-form-item label="标段状态" prop="rtnSgtst">
+				<el-input v-model="queryParams.rtnSgtst" placeholder="请输入标段状态0-已发标1-已截标2-已开标3-已流标"
+						  clearable
+						  @keyup.enter.native="handleQuery"/>
+			</el-form-item>
 
-      <el-form-item label="客户名称" prop="rtnCstnms">
-        <el-input v-model="queryParams.rtnCstnms" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+			<el-form-item label="客户名称" prop="rtnCstnms">
+				<el-input v-model="queryParams.rtnCstnms" 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-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:tenderquery: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:tenderquery: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:tenderquery: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:tenderquery: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:tenderquery: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:tenderquery: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:tenderquery: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:tenderquery:export']">导出
+				</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
 
-    <el-table v-loading="loading" :data="tenderqueryList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="标段信息查询id" align="center" prop="tenderqueryid" 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="rqbody" v-if="false"/>
-      <el-table-column label="标段id" align="center" prop="sgtid" v-if="false"/>
-      <el-table-column label="账号，当标段id为空时,必输" align="center" prop="acctno" v-if="false"/>
-      <el-table-column label="项目编号，当标段id为空时, 必输" align="center" prop="prjno" v-if="false"/>
-      <el-table-column label="标段编号，当标段id为空时, 必输" align="center" prop="sgtno" v-if="false"/>
-      <el-table-column label="平台客户编号，当标段id为空时, 必输" align="center" prop="pltfmcstno" v-if="false"/>
-      <el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid" v-if="false"/>
-      <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">
-        <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="rtnPdno" />
-      <el-table-column label="币种代码01-人民币" align="center" prop="rtnCcycd" v-if="false"/>
-      <el-table-column label="项目编号" align="center" prop="rtnPrjno" />
-      <el-table-column label="标段ID" align="center" prop="rtnSgtid" />
-      <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="rtnSgtacctgentp" v-if="false"/>
-      <el-table-column label="标段账号" align="center" prop="rtnSgtacctno" />
-      <el-table-column label="标段类型0-标段模式 2-公共标段模式" align="center" prop="rtnSgttp" />
-      <el-table-column label="计息标志0-不计息 1-计息" align="center" prop="rtnIntacrlflg" />
-      <el-table-column label="保密类型0-公开 1-保密" align="center" prop="rtnSecrettp" v-if="false"/>
-      <el-table-column label="投标账号白名单校验标志0-不校验 1-校验" align="center" prop="rtnTdracctnovrfyflg" v-if="false"/>
-      <el-table-column label="允许截止后投标标志0-不允许 1-允许" align="center" prop="rtnAlwafddlntdrflg" />
-      <el-table-column label="银行退款确认标志0-不需要 1-需要" align="center" prop="rtnBnkrfndcfrmflg" />
-      <el-table-column label="保证金金额 double" align="center" prop="rtnMrgnamt" />
-      <el-table-column label="发标日期" align="center" prop="rtnStrtsgtdt" width="180" />
-      <el-table-column label="保证金缴纳截止日期" align="center" prop="rtnMrgnduestopdt" width="180" />
-      <el-table-column label="保证金缴纳截止时间" align="center" prop="rtnMrgnduestoptm" width="180" />
-      <el-table-column label="开标日期" align="center" prop="rtnOpntdrdt" width="180" />
-      <el-table-column label="开标时间" align="center" prop="rtnOpntdrtm" width="180" />
-      <el-table-column label="到期日期" align="center" prop="rtnExpdt" width="180" />
-      <el-table-column label="核心客户号" align="center" prop="rtnPltfmcstno" />
-      <el-table-column label="标段状态0-已发标1-已截标2-已开标3-已流标" align="center" prop="rtnSgtst" />
-      <el-table-column label="标段查询状态0-未查1-已查" align="center" prop="rtnSgtqryst" />
-      <el-table-column label="客户名称" align="center" prop="rtnCstnms" />
-      <el-table-column label="账户名称" align="center" prop="rtnAcctnm" />
-      <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:tenderquery:edit']">修改
-          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['bank:tenderquery:remove']">删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+		<el-table v-loading="loading" :data="tenderqueryList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center"/>
+			<el-table-column label="标段信息查询id" align="center" prop="tenderqueryid" v-if="false"/>
+			<el-table-column label="采购公告" align="center" prop="ppid"/>
+			<el-table-column label="交易流水" align="center" prop="trnuid"  width="100"/>
+			<el-table-column label="报文节点" align="center" prop="rqbody" v-if="false"/>
+			<el-table-column label="标段id" align="center" prop="sgtid" v-if="false"/>
+			<el-table-column label="账号，当标段id为空时,必输" align="center" prop="acctno" v-if="false"/>
+			<el-table-column label="项目编号，当标段id为空时, 必输" align="center" prop="prjno" v-if="false"/>
+			<el-table-column label="标段编号，当标段id为空时, 必输" align="center" prop="sgtno" v-if="false"/>
+			<el-table-column label="平台客户编号，当标段id为空时, 必输" align="center" prop="pltfmcstno" v-if="false"/>
+			<el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid" v-if="false"/>
+			<el-table-column label="交易处理状态" align="center" prop="rtnStatus"  width="100"/>
+			<el-table-column label="处理结果码" align="center" prop="rtnCode"  width="100"/>
+			<el-table-column label="处理结果等级" align="center" prop="rtnSeverity"  width="100">
+				<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"  width="100"/>
+			<el-table-column label="报文节点" align="center" prop="rtnRsbody" v-if="false"/>
+			<el-table-column label="产品编号" align="center" prop="rtnPdno"/>
+			<el-table-column label="币种代码01-人民币" align="center" prop="rtnCcycd" v-if="false"/>
+			<el-table-column label="项目编号" align="center" prop="rtnPrjno"/>
+			<el-table-column label="标段ID" align="center" prop="rtnSgtid"  width="150"/>
+			<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="rtnSgtacctgentp"
+							 v-if="false"/>
+			<el-table-column label="标段账号" align="center" prop="rtnSgtacctno"/>
+			<el-table-column label="标段类型" align="center" prop="rtnSgttp">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnSgttp * 1 === 0">标段模式</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnSgttp* 1 === 2">公共标段模式</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="计息标志" align="center" prop="rtnIntacrlflg">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnIntacrlflg * 1 === 0">不计息</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnIntacrlflg* 1 === 1">计息</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="保密类型0-公开 1-保密" align="center" prop="rtnSecrettp" v-if="false"/>
+			<el-table-column label="投标账号白名单校验标志0-不校验 1-校验" align="center" prop="rtnTdracctnovrfyflg"
+							 v-if="false"/>
+			<el-table-column label="允许截止后投标" align="center" prop="rtnAlwafddlntdrflg"  width="120">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnAlwafddlntdrflg * 1 === 0">不允许</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnAlwafddlntdrflg * 1 === 1">允许</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="银行退款确认" align="center" prop="rtnBnkrfndcfrmflg"  width="100">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnBnkrfndcfrmflg * 1 === 0">不需要</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnBnkrfndcfrmflg * 1 === 1">需要</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="保证金金额" align="center" prop="rtnMrgnamt"  width="100"/>
+			<el-table-column label="发标日期" align="center" prop="rtnStrtsgtdt" width="180"/>
+			<el-table-column label="保证金缴纳截止日期" align="center" prop="rtnMrgnduestopdt" width="180">
+				<template slot-scope="scope">
+					{{ formatDate(scope.row.rtnMrgnduestopdt, scope.row.rtnMrgnduestoptm) }}
+				</template>
+			</el-table-column>
+			<el-table-column label="保证金缴纳截止时间" align="center" prop="rtnMrgnduestoptm" width="180" v-if="false"/>
+			<el-table-column label="开标日期" align="center" prop="rtnOpntdrdt" width="180">
+				<template slot-scope="scope">
+					{{ formatDate(scope.row.rtnOpntdrdt, scope.row.rtnOpntdrtm) }}
+				</template>
+			</el-table-column>
+			<el-table-column label="开标时间" align="center" prop="rtnOpntdrtm" width="180" v-if="false"/>
+			<el-table-column label="到期日期" align="center" prop="rtnExpdt" width="180"/>
+			<el-table-column label="核心客户号" align="center" prop="rtnPltfmcstno"  width="100"/>
+			<el-table-column label="标段状态" align="center" prop="rtnSgtst">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnSgtst * 1 === 0">已发标</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnSgtst * 1 === 1">已截标</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnSgtst * 1 === 2">已开标</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnSgtst * 1 === 3">已流标</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="标段查询状态" align="center" prop="rtnSgtqryst"  width="100">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnSgtst * 1 === 0">未查</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnSgtst * 1 === 1">已查</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="客户名称" align="center" prop="rtnCstnms"/>
+			<el-table-column label="账户名称" align="center" prop="rtnAcctnm"/>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width"  width="200">
+				<template slot-scope="scope">
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+							   v-hasPermi="['bank:tenderquery:edit']">修改
+					</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+							   v-hasPermi="['bank:tenderquery: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="账号，当标段id为空时,必输" prop="acctno">
-          <el-input v-model="form.acctno" placeholder="请输入账号，当标段id为空时,必输" />
-        </el-form-item>
-        <el-form-item label="项目编号，当标段id为空时, 必输" prop="prjno">
-          <el-input v-model="form.prjno" placeholder="请输入项目编号，当标段id为空时, 必输" />
-        </el-form-item>
-        <el-form-item label="标段编号，当标段id为空时, 必输" prop="sgtno">
-          <el-input v-model="form.sgtno" placeholder="请输入标段编号，当标段id为空时, 必输" />
-        </el-form-item>
-        <el-form-item label="平台客户编号，当标段id为空时, 必输" prop="pltfmcstno">
-          <el-input v-model="form.pltfmcstno" placeholder="请输入平台客户编号，当标段id为空时, 必输" />
-        </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="rtnPdno">
-          <el-input v-model="form.rtnPdno" placeholder="请输入产品编号" />
-        </el-form-item>
-        <el-form-item label="币种代码01-人民币" prop="rtnCcycd">
-          <el-input v-model="form.rtnCcycd" placeholder="请输入币种代码01-人民币" />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="rtnPrjno">
-          <el-input v-model="form.rtnPrjno" 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="标段编号" 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="rtnSgtacctgentp">
-          <el-input v-model="form.rtnSgtacctgentp" placeholder="请输入标段账户生成类型0-自动生成 1-自定义账号" />
-        </el-form-item>
-        <el-form-item label="标段账号" prop="rtnSgtacctno">
-          <el-input v-model="form.rtnSgtacctno" placeholder="请输入标段账号" />
-        </el-form-item>
-        <el-form-item label="标段类型0-标段模式 2-公共标段模式" prop="rtnSgttp">
-          <el-input v-model="form.rtnSgttp" placeholder="请输入标段类型0-标段模式 2-公共标段模式" />
-        </el-form-item>
-        <el-form-item label="计息标志0-不计息 1-计息" prop="rtnIntacrlflg">
-          <el-input v-model="form.rtnIntacrlflg" placeholder="请输入计息标志0-不计息 1-计息" />
-        </el-form-item>
-        <el-form-item label="保密类型0-公开 1-保密" prop="rtnSecrettp">
-          <el-input v-model="form.rtnSecrettp" placeholder="请输入保密类型0-公开 1-保密" />
-        </el-form-item>
-        <el-form-item label="投标账号白名单校验标志0-不校验 1-校验" prop="rtnTdracctnovrfyflg">
-          <el-input v-model="form.rtnTdracctnovrfyflg" placeholder="请输入投标账号白名单校验标志0-不校验 1-校验" />
-        </el-form-item>
-        <el-form-item label="允许截止后投标标志0-不允许 1-允许" prop="rtnAlwafddlntdrflg">
-          <el-input v-model="form.rtnAlwafddlntdrflg" placeholder="请输入允许截止后投标标志0-不允许 1-允许" />
-        </el-form-item>
-        <el-form-item label="银行退款确认标志0-不需要 1-需要" prop="rtnBnkrfndcfrmflg">
-          <el-input v-model="form.rtnBnkrfndcfrmflg" placeholder="请输入银行退款确认标志0-不需要 1-需要" />
-        </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="保证金缴纳截止日期" prop="rtnMrgnduestopdt">
-          <el-date-picker clearable v-model="form.rtnMrgnduestopdt" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择保证金缴纳截止日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="保证金缴纳截止时间" prop="rtnMrgnduestoptm">
-          <el-date-picker clearable v-model="form.rtnMrgnduestoptm" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择保证金缴纳截止时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="开标日期yyyymmdd" prop="rtnOpntdrdt">
-          <el-date-picker clearable v-model="form.rtnOpntdrdt" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择开标日期yyyymmdd">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="开标时间hhmmss" prop="rtnOpntdrtm">
-          <el-date-picker clearable v-model="form.rtnOpntdrtm" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择开标时间hhmmss">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="到期日期yyyymmdd" prop="rtnExpdt">
-          <el-date-picker clearable v-model="form.rtnExpdt" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择到期日期yyyymmdd">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="核心客户号" prop="rtnPltfmcstno">
-          <el-input v-model="form.rtnPltfmcstno" placeholder="请输入核心客户号" />
-        </el-form-item>
-        <el-form-item label="标段状态0-已发标1-已截标2-已开标3-已流标" prop="rtnSgtst">
-          <el-input v-model="form.rtnSgtst" placeholder="请输入标段状态0-已发标1-已截标2-已开标3-已流标" />
-        </el-form-item>
-        <el-form-item label="标段查询状态0-未查1-已查" prop="rtnSgtqryst">
-          <el-input v-model="form.rtnSgtqryst" placeholder="请输入标段查询状态0-未查1-已查" />
-        </el-form-item>
-        <el-form-item label="客户名称" prop="rtnCstnms">
-          <el-input v-model="form.rtnCstnms" placeholder="请输入客户名称" />
-        </el-form-item>
-        <el-form-item label="账户名称" prop="rtnAcctnm">
-          <el-input v-model="form.rtnAcctnm" 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="账号，当标段id为空时,必输" prop="acctno">
+					<el-input v-model="form.acctno" placeholder="请输入账号，当标段id为空时,必输"/>
+				</el-form-item>
+				<el-form-item label="项目编号，当标段id为空时, 必输" prop="prjno">
+					<el-input v-model="form.prjno" placeholder="请输入项目编号，当标段id为空时, 必输"/>
+				</el-form-item>
+				<el-form-item label="标段编号，当标段id为空时, 必输" prop="sgtno">
+					<el-input v-model="form.sgtno" placeholder="请输入标段编号，当标段id为空时, 必输"/>
+				</el-form-item>
+				<el-form-item label="平台客户编号，当标段id为空时, 必输" prop="pltfmcstno">
+					<el-input v-model="form.pltfmcstno" placeholder="请输入平台客户编号，当标段id为空时, 必输"/>
+				</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="rtnPdno">
+					<el-input v-model="form.rtnPdno" placeholder="请输入产品编号"/>
+				</el-form-item>
+				<el-form-item label="币种代码01-人民币" prop="rtnCcycd">
+					<el-input v-model="form.rtnCcycd" placeholder="请输入币种代码01-人民币"/>
+				</el-form-item>
+				<el-form-item label="项目编号" prop="rtnPrjno">
+					<el-input v-model="form.rtnPrjno" 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="标段编号" 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="rtnSgtacctgentp">
+					<el-input v-model="form.rtnSgtacctgentp"
+							  placeholder="请输入标段账户生成类型0-自动生成 1-自定义账号"/>
+				</el-form-item>
+				<el-form-item label="标段账号" prop="rtnSgtacctno">
+					<el-input v-model="form.rtnSgtacctno" placeholder="请输入标段账号"/>
+				</el-form-item>
+				<el-form-item label="标段类型0-标段模式 2-公共标段模式" prop="rtnSgttp">
+					<el-input v-model="form.rtnSgttp" placeholder="请输入标段类型0-标段模式 2-公共标段模式"/>
+				</el-form-item>
+				<el-form-item label="计息标志0-不计息 1-计息" prop="rtnIntacrlflg">
+					<el-input v-model="form.rtnIntacrlflg" placeholder="请输入计息标志0-不计息 1-计息"/>
+				</el-form-item>
+				<el-form-item label="保密类型0-公开 1-保密" prop="rtnSecrettp">
+					<el-input v-model="form.rtnSecrettp" placeholder="请输入保密类型0-公开 1-保密"/>
+				</el-form-item>
+				<el-form-item label="投标账号白名单校验标志0-不校验 1-校验" prop="rtnTdracctnovrfyflg">
+					<el-input v-model="form.rtnTdracctnovrfyflg"
+							  placeholder="请输入投标账号白名单校验标志0-不校验 1-校验"/>
+				</el-form-item>
+				<el-form-item label="允许截止后投标标志0-不允许 1-允许" prop="rtnAlwafddlntdrflg">
+					<el-input v-model="form.rtnAlwafddlntdrflg" placeholder="请输入允许截止后投标标志0-不允许 1-允许"/>
+				</el-form-item>
+				<el-form-item label="银行退款确认标志0-不需要 1-需要" prop="rtnBnkrfndcfrmflg">
+					<el-input v-model="form.rtnBnkrfndcfrmflg" placeholder="请输入银行退款确认标志0-不需要 1-需要"/>
+				</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="保证金缴纳截止日期" prop="rtnMrgnduestopdt">
+					<el-date-picker clearable v-model="form.rtnMrgnduestopdt" type="date" value-format="yyyy-MM-dd"
+									placeholder="请选择保证金缴纳截止日期">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="保证金缴纳截止时间" prop="rtnMrgnduestoptm">
+					<el-date-picker clearable v-model="form.rtnMrgnduestoptm" type="date" value-format="yyyy-MM-dd"
+									placeholder="请选择保证金缴纳截止时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="开标日期yyyymmdd" prop="rtnOpntdrdt">
+					<el-date-picker clearable v-model="form.rtnOpntdrdt" type="date" value-format="yyyy-MM-dd"
+									placeholder="请选择开标日期yyyymmdd">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="开标时间hhmmss" prop="rtnOpntdrtm">
+					<el-date-picker clearable v-model="form.rtnOpntdrtm" type="date" value-format="yyyy-MM-dd"
+									placeholder="请选择开标时间hhmmss">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="到期日期yyyymmdd" prop="rtnExpdt">
+					<el-date-picker clearable v-model="form.rtnExpdt" type="date" value-format="yyyy-MM-dd"
+									placeholder="请选择到期日期yyyymmdd">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="核心客户号" prop="rtnPltfmcstno">
+					<el-input v-model="form.rtnPltfmcstno" placeholder="请输入核心客户号"/>
+				</el-form-item>
+				<el-form-item label="标段状态0-已发标1-已截标2-已开标3-已流标" prop="rtnSgtst">
+					<el-input v-model="form.rtnSgtst" placeholder="请输入标段状态0-已发标1-已截标2-已开标3-已流标"/>
+				</el-form-item>
+				<el-form-item label="标段查询状态0-未查1-已查" prop="rtnSgtqryst">
+					<el-input v-model="form.rtnSgtqryst" placeholder="请输入标段查询状态0-未查1-已查"/>
+				</el-form-item>
+				<el-form-item label="客户名称" prop="rtnCstnms">
+					<el-input v-model="form.rtnCstnms" placeholder="请输入客户名称"/>
+				</el-form-item>
+				<el-form-item label="账户名称" prop="rtnAcctnm">
+					<el-input v-model="form.rtnAcctnm" 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 {
-  listTenderquery,
-  getTenderquery,
-  delTenderquery,
-  addTenderquery,
-  updateTenderquery
+	listTenderquery,
+	getTenderquery,
+	delTenderquery,
+	addTenderquery,
+	updateTenderquery
 } from "@/api/bank/tenderquery";
 
 export default {
-  name: "Tenderquery",
-  data () {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 标段信息查询表格数据
-      tenderqueryList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        ppid: null,
-        trnuid: null,
-        rqbody: null,
-        sgtid: null,
-        acctno: null,
-        prjno: null,
-        sgtno: null,
-        pltfmcstno: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnMessage: null,
-        rtnRsbody: null,
-        rtnPdno: null,
-        rtnCcycd: null,
-        rtnPrjno: null,
-        rtnSgtid: this.$route.query.rtnSgtid,
-        rtnSgtno: null,
-        rtnSgtnm: null,
-        rtnSgtacctgentp: null,
-        rtnSgtacctno: null,
-        rtnSgttp: null,
-        rtnIntacrlflg: null,
-        rtnSecrettp: null,
-        rtnTdracctnovrfyflg: null,
-        rtnAlwafddlntdrflg: null,
-        rtnBnkrfndcfrmflg: null,
-        rtnMrgnamt: null,
-        rtnStrtsgtdt: null,
-        rtnMrgnduestopdt: null,
-        rtnMrgnduestoptm: null,
-        rtnOpntdrdt: null,
-        rtnOpntdrtm: null,
-        rtnExpdt: null,
-        rtnPltfmcstno: null,
-        rtnSgtst: null,
-        rtnSgtqryst: null,
-        rtnCstnms: null,
-        rtnAcctnm: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        ppid: [
-          { required: true, message: "采购计划id不能为空", trigger: "blur" }
-        ],
-        trnuid: [
-          { required: true, message: "客户端交易的唯一流水号建议值为yyyymmdd+序号不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created () {
+	name: "Tenderquery",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 标段信息查询表格数据
+			tenderqueryList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				ppid: null,
+				trnuid: null,
+				rqbody: null,
+				sgtid: null,
+				acctno: null,
+				prjno: null,
+				sgtno: null,
+				pltfmcstno: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnMessage: null,
+				rtnRsbody: null,
+				rtnPdno: null,
+				rtnCcycd: null,
+				rtnPrjno: null,
+				rtnSgtid: this.$route.query.rtnSgtid,
+				rtnSgtno: null,
+				rtnSgtnm: null,
+				rtnSgtacctgentp: null,
+				rtnSgtacctno: null,
+				rtnSgttp: null,
+				rtnIntacrlflg: null,
+				rtnSecrettp: null,
+				rtnTdracctnovrfyflg: null,
+				rtnAlwafddlntdrflg: null,
+				rtnBnkrfndcfrmflg: null,
+				rtnMrgnamt: null,
+				rtnStrtsgtdt: null,
+				rtnMrgnduestopdt: null,
+				rtnMrgnduestoptm: null,
+				rtnOpntdrdt: null,
+				rtnOpntdrtm: null,
+				rtnExpdt: null,
+				rtnPltfmcstno: null,
+				rtnSgtst: null,
+				rtnSgtqryst: null,
+				rtnCstnms: null,
+				rtnAcctnm: 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;
-      listTenderquery(this.queryParams).then(response => {
-        this.tenderqueryList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel () {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset () {
-      this.form = {
-        tenderqueryid: null,
-        ppid: null,
-        trnuid: null,
-        rqbody: null,
-        sgtid: null,
-        acctno: null,
-        prjno: null,
-        sgtno: null,
-        pltfmcstno: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnMessage: null,
-        rtnRsbody: null,
-        rtnPdno: null,
-        rtnCcycd: null,
-        rtnPrjno: null,
-        rtnSgtid: null,
-        rtnSgtno: null,
-        rtnSgtnm: null,
-        rtnSgtacctgentp: null,
-        rtnSgtacctno: null,
-        rtnSgttp: null,
-        rtnIntacrlflg: null,
-        rtnSecrettp: null,
-        rtnTdracctnovrfyflg: null,
-        rtnAlwafddlntdrflg: null,
-        rtnBnkrfndcfrmflg: null,
-        rtnMrgnamt: null,
-        rtnMrgnduestopdt: null,
-        rtnMrgnduestoptm: null,
-        rtnOpntdrdt: null,
-        rtnOpntdrtm: null,
-        rtnExpdt: null,
-        rtnPltfmcstno: null,
-        rtnSgtst: null,
-        rtnSgtqryst: null,
-        rtnCstnms: null,
-        rtnAcctnm: 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.tenderqueryid)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd () {
-      this.reset();
-      this.open = true;
-      this.title = "添加标段信息查询";
-    },
-    /** 修改按钮操作 */
-    handleUpdate (row) {
-      this.reset();
-      const tenderqueryid = row.tenderqueryid || this.ids
-      getTenderquery(tenderqueryid).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改标段信息查询";
-      });
-    },
-    /** 提交按钮 */
-    submitForm () {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.tenderqueryid != null) {
-            updateTenderquery(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addTenderquery(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete (row) {
-      const tenderqueryids = row.tenderqueryid || this.ids;
-      this.$modal.confirm('是否确认删除标段信息查询编号为"' + tenderqueryids + '"的数据项？').then(function () {
-        return delTenderquery(tenderqueryids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport () {
-      this.download('bank/tenderquery/export', {
-        ...this.queryParams
-      }, `tenderquery_${new Date().getTime()}.xlsx`)
-    }
-  }
+		this.getList();
+	},
+	methods: {
+		/** 查询标段信息查询列表 */
+		getList() {
+			this.loading = true;
+			listTenderquery(this.queryParams).then(response => {
+				this.tenderqueryList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				tenderqueryid: null,
+				ppid: null,
+				trnuid: null,
+				rqbody: null,
+				sgtid: null,
+				acctno: null,
+				prjno: null,
+				sgtno: null,
+				pltfmcstno: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnMessage: null,
+				rtnRsbody: null,
+				rtnPdno: null,
+				rtnCcycd: null,
+				rtnPrjno: null,
+				rtnSgtid: null,
+				rtnSgtno: null,
+				rtnSgtnm: null,
+				rtnSgtacctgentp: null,
+				rtnSgtacctno: null,
+				rtnSgttp: null,
+				rtnIntacrlflg: null,
+				rtnSecrettp: null,
+				rtnTdracctnovrfyflg: null,
+				rtnAlwafddlntdrflg: null,
+				rtnBnkrfndcfrmflg: null,
+				rtnMrgnamt: null,
+				rtnMrgnduestopdt: null,
+				rtnMrgnduestoptm: null,
+				rtnOpntdrdt: null,
+				rtnOpntdrtm: null,
+				rtnExpdt: null,
+				rtnPltfmcstno: null,
+				rtnSgtst: null,
+				rtnSgtqryst: null,
+				rtnCstnms: null,
+				rtnAcctnm: 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.tenderqueryid)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加标段信息查询";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const tenderqueryid = row.tenderqueryid || this.ids
+			getTenderquery(tenderqueryid).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改标段信息查询";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.tenderqueryid != null) {
+						updateTenderquery(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addTenderquery(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const tenderqueryids = row.tenderqueryid || this.ids;
+			this.$modal.confirm('是否确认删除标段信息查询编号为"' + tenderqueryids + '"的数据项？').then(function () {
+				return delTenderquery(tenderqueryids);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('bank/tenderquery/export', {
+				...this.queryParams
+			}, `tenderquery_${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>