Merge branch 'development-202206' into 'development-202206'

Development 202206

See merge request !12

src/config/CodeTable/index.js

@@ -6943,18 +6943,18 @@ const CodeTable = {
         { label: "EUR 欧元", value: "EUR" },
         { label: "FIM 芬兰马克", value: "FIM" },
         { label: "FRF 法国法郎", value: "FRF" },
-        { label: "GBP 英镑", value: "FRF" },
-        { label: "HKD 港币", value: "FRF" },
-        { label: "JPY 日元", value: "FRF" },
-        { label: "KRW 韩圆", value: "FRF" },
-        { label: "MOP 澳门元", value: "FRF" },
-        { label: "NOK 挪威克朗", value: "FRF" },
-        { label: "NZD 新西兰元", value: "FRF" },
-        { label: "SEK 瑞典克朗", value: "FRF" },
-        { label: "SGD 新加坡元", value: "FRF" },
-        { label: "THB 泰国铢", value: "FRF" },
-        { label: "TWD 新台湾元", value: "FRF" },
-        { label: "USD 美元", value: "FRF" },
+        { label: "GBP 英镑", value: "GBP" },
+        { label: "HKD 港币", value: "HKD" },
+        { label: "JPY 日元", value: "JPY" },
+        { label: "KRW 韩圆", value: "KRW" },
+        { label: "MOP 澳门元", value: "MOP" },
+        { label: "NOK 挪威克朗", value: "NOK" },
+        { label: "NZD 新西兰元", value: "NZD" },
+        { label: "SEK 瑞典克朗", value: "SEK" },
+        { label: "SGD 新加坡元", value: "SGD" },
+        { label: "THB 泰国铢", value: "THB" },
+        { label: "TWD 新台湾元", value: "TWD" },
+        { label: "USD 美元", value: "USD" },
     ],
     infled_sealcrtyp: [
         { label: "不可撤销", value: "0" },

src/model/Botdav/index.js

@@ -115,7 +115,7 @@ export default class Botdav {
 					},
 				},
 				docgrdm: {
-					docgrd: "",
+					docgrd: [],
 					docdsclab: "",			//  Label of document description		.botp.docgrdm.docdsclab
 				},
 				drrp: {

src/model/Cltdav/Event.js

@@ -33,6 +33,9 @@ export default {
             //TODO 列表显示数据
             this.model.bptbck.bptbckg = rtnmsg.data.ccdbatg;
         }
+        else {
+            this.$notify.error({ title: '错误', message: '服务请求失败！' });
+        }
     },
     async onCltpButgetref() {
         let rtnmsg = await this.executeRule("cltp.butgetref")

src/model/Cptopn/Pattern.js

@@ -85,7 +85,7 @@ export default {
 
     "cptp.payeecountcode":[
         {type: "string", required: true, message: "必输项"},
-        {max: 3,message:"长度不能超过3"}
+        {max: 13,message:"长度不能超过13"}
     ],
 
 

src/model/Litrog/Pattern.js

@@ -81,7 +81,7 @@ export default {
         {max: 16,message:"长度不能超过16"}
     ],
     "brdgrp.rec.shgref":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
     ],
     "brdgrp.rec.nam":[
@@ -90,7 +90,7 @@ export default {
     ],
 
     "brdgrp.rec.ownref":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
     ],
 

src/views/Business/Botdav/Ovwp1.vue

@@ -9,7 +9,7 @@
                 <c-input v-model="model.bodgrp.rec.ownref" maxlength="16" placeholder="请输入托收业务编号" style="width: 100%"
                          disabled></c-input>
                 <template slot="footer">
-                  <c-button type="primary" :disabled="this.model.bodgrp.drr.pts.extkey !== '' && model.bedgrp.rec.ownref == ''? false:true" @click="onBotpButgetref">
+                  <c-button type="primary" :disabled="this.model.bodgrp.drr.pts.extkey !== '' && model.bodgrp.rec.ownref === ''? false:true" @click="onBotpButgetref">
                     获取
                   </c-button>
                 </template>
@@ -64,7 +64,7 @@
       <c-col :span="12">
         <el-form-item label="托收金额" prop="bodgrp.cbs.max.cur">
           <c-select v-model="model.bodgrp.cbs.max.cur" style="width: 100%" placeholder="请选择币种"  @change="changeCur">
-            <el-option v-for="item in codes.curtxt1" :key="item.value" :label="item.label" :value="item.value">
+            <el-option v-for="item in codes.infled_Cur" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </c-select>
         </el-form-item>
@@ -135,7 +135,7 @@
 
       <c-col :span="12">
         <el-form-item label="发票类型" prop="bodgrp.rec.invtyp">
-          <c-select v-model="model.bodgrp.rec.invtyp" style="width:100%" :code="invtyp2">
+          <c-select v-model="model.bodgrp.rec.invtyp" style="width:100%" :code="codes.invtyp">
           </c-select>
         </el-form-item>
       </c-col>

src/views/Business/Brtset/Trtcrep.vue

@@ -155,7 +155,7 @@
             <c-col :span="12">
                 <el-form-item label="计息周期" prop="trtcre.trtmod.finmod.intprd">
                     <c-select v-model="model.trtcre.trtmod.finmod.intprd" style="width: 100%" placeholder="请选择计息周期">
-                        <el-option v-for="item in codes.intprd" :key="item.value" :label="item.label" :value="item.value">
+                        <el-option v-for="item in codes.intprd1" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </c-select>
                 </el-form-item>

src/views/Business/Brtset/Utlp.vue

@@ -287,7 +287,7 @@
               <c-input
                 v-model="model.aamset.utlamt"
                 placeholder="请输入金额"
-                :disabled="true"
+                
                 @keyup.enter.native="$event.target.blur()"
                 @blur="eventFunction('aamset.utlamt')"
               ></c-input>
@@ -313,7 +313,7 @@
               <c-input
                 v-model="model.aamset.utlamt2"
                 placeholder="请输入金额"
-                :disabled="true"
+              
                 @change="eventFunction('aamset.utlamt2')"
               ></c-input>
             </el-form-item>
@@ -343,7 +343,7 @@
               label-width="120px"
               style="float: left"
             >
-              <c-checkbox v-model="model.mtabut.clsflg" true-label="C"
+              <c-checkbox :disabled="this.model.trnmod.cmtflg==''" v-model="model.mtabut.clsflg" true-label="C"
                 >闭卷标识</c-checkbox
               >
             </el-form-item>

src/views/Business/Cnysel/Selp.vue

@@ -60,7 +60,8 @@
             <!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
           </template>
           <template slot-scope="scope">
-            <c-button size="small" @click="getTrnInfo(scope.$index, scope.row)" slot="reference" :disabled="model.cnytyp == '6'">
+            <c-button size="small" @click="getTrnInfo(scope.$index, scope.row)" slot="reference"
+              :disabled="model.cnytyp == '6'">
               详情</c-button>
           </template>
         </el-table-column>
@@ -73,6 +74,7 @@
 </template>
 <script>
 import Api from "~/service/Api";
+import Utils from "~/utils";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Cnysel/Event";
@@ -111,23 +113,42 @@ export default {
   methods: {
     ...Event,
     async getTrnInfo(idx, row) {
-      // this.model.infcon.objinr = row["INR"];
-      // this.model.bodgrp.rec.inr = row["INR"];
-      // this.model.infcon.chksubcon = "X";
       console.log(row);
-      console.log(this.tabVal);
-      this.tabVal = "litp";
-      // tabVal: "selp",
-      // console.log(row.申报类型);
-      // let url = row.申报类型.toLowerCase() + "inf";
-      // this.$router.history.push("/business/" + url);
-
-
-      // let rtnmsg = await this.executeDefault("dtlbut");
-      // // if ((rtnmsg.respCode = SUCCESS)) {
-      //     this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
-      //     console.log(this.trnData.data);
-      // }
+      console.log(this.root.tabVal);
+      console.log(this.model.cnytyp);
+      const selIds = [idx + 1];
+      const selDst = "cnystm" //列表对应后台模型中的stream
+      let params = { selDst, selIds };
+      this.executeRule("dtlbut", params).then((res) => {
+        if (res.respCode == SUCCESS) {
+          console.log(res.data);
+          Utils.copyValueFromVO(this.model, res.data);
+          switch (this.model.cnytyp) {
+            case "1":
+              this.root.tabVal = "incp";
+              break;
+            case "2":
+              this.root.tabVal = "outp";
+              break;
+            case "3":
+              this.root.tabVal = "libp";
+              break;
+            case "4":
+              this.root.tabVal = "trap";
+              break;
+            case "5":
+              this.root.tabVal = "voup";
+              break;
+            default:
+              this.root.tabVal = "selp";
+          }
+        } else {
+          const h = this.$createElement;
+          const msg = res.respMsg || '请求执行失败!'
+          this.$notify.error({ title: '错误', message: h('p', { style: 'word-break:break-all;' }, msg) })
+        }
+      })
+      console.log(this.root.tabVal);
     }
   },
   created: function () { },

src/views/Business/Cnysel/index.vue

 <template>
-  <c-page title="跨境人民币查询">
   <div class="eContainer">
+    <c-page title="跨境人民币查询">
         <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small"
           :validate-on-rule-change="false">
           <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
@@ -41,15 +41,17 @@
               </content>
             </el-tab-pane>
           </c-tabs>
+          <!-- <c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" v-if="this.tabVal !== 'selp'"></c-function-btn> -->
         </el-form>
-    </div>
     </c-page>
+  </div>
 </template>
 <script>
 import Api from "~/service/Api";
 import CodeTable from "~/config/CodeTable";
 import Cnysel from "~/model/Cnysel";
 import commonProcess from "~/mixin/commonProcess";
+import commonFuncs from "~/mixin/commonFuncs";
 import Check from "~/model/Cnysel/Check";
 import Default from "~/model/Cnysel/Default";
 import Pattern from "~/model/Cnysel/Pattern";
@@ -76,7 +78,7 @@ export default {
       root: this,
     };
   },
-  mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
+  mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
   data() {
     return {
       tabVal: "selp",

src/views/Business/Cptopn/Payment103.vue

@@ -6,7 +6,6 @@
         <el-form-item
           label="消息接收者"
           style="width: 100%"
-          label-width="35%"
         >
           <c-fullbox>
             <c-input maxlength="16" placeholder="请输入" disabled></c-input>
@@ -31,7 +30,7 @@
           </c-fullbox>
         </el-form-item>
         <c-col :span="24">
-          <el-form-item label="" label-width="35%">
+          <el-form-item label="">
             <c-input
               type="textarea"
               :rows="3"
@@ -48,7 +47,6 @@
         <el-form-item
           label="发件人的相关信息(Tag 53a)"
           style="width: 100%"
-          label-width="35%"
         >
           <c-fullbox>
             <c-input maxlength="16" placeholder="请输入" disabled></c-input>
@@ -73,7 +71,7 @@
           </c-fullbox>
         </el-form-item>
         <c-col :span="24">
-          <el-form-item label="" label-width="35%">
+          <el-form-item label="">
             <c-input
               type="textarea"
               :rows="3"
@@ -90,7 +88,6 @@
         <el-form-item
           label="接收人的相关信息(Tag 54a)"
           style="width: 100%"
-          label-width="35%"
         >
           <c-fullbox>
             <c-input maxlength="16" placeholder="请输入" disabled></c-input>
@@ -115,7 +112,7 @@
           </c-fullbox>
         </el-form-item>
         <c-col :span="24">
-          <el-form-item label="" label-width="35%">
+          <el-form-item label="">
             <c-input
               type="textarea"
               :rows="3"
@@ -129,7 +126,7 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="收款更正账户" label-width="35%">
+        <el-form-item label="收款更正账户">
           <c-input maxlength="16" placeholder="" disabled></c-input>
         </el-form-item>
       </c-col>
@@ -138,7 +135,6 @@
         <el-form-item
           label="中介机构(Tag 54a)"
           style="width: 100%"
-          label-width="35%"
         >
           <c-fullbox>
             <c-input
@@ -170,7 +166,7 @@
           </c-fullbox>
         </el-form-item>
         <c-col :span="24">
-          <el-form-item label="" label-width="35%">
+          <el-form-item label="">
             <c-input
               type="textarea"
               :rows="3"
@@ -185,7 +181,7 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="中介账户" label-width="35%">
+        <el-form-item label="中介账户">
           <c-input
             maxlength="16"
             placeholder=""
@@ -201,7 +197,6 @@
         <el-form-item
           label="机构账户/账户(Tag 54a)"
           style="width: 100%"
-          label-width="35%"
         >
           <c-fullbox>
             <c-input
@@ -234,7 +229,7 @@
           </c-fullbox>
         </el-form-item>
         <c-col :span="24">
-          <el-form-item label="" label-width="35%">
+          <el-form-item label="">
             <c-input
               type="textarea"
               :rows="3"
@@ -248,7 +243,7 @@
         </c-col>
         <c-col :span="24">
           <c-col :span="24">
-            <el-form-item label="" label-width="35%">
+            <el-form-item label="">
               <c-col :span="19">
                 <c-input
                   maxlength="140"
@@ -270,7 +265,6 @@
         <el-form-item
           label="受益人客户/账户(Tag 59a)"
           style="width: 100%"
-          label-width="35%"
         >
           <c-fullbox>
             <c-input
@@ -301,7 +295,7 @@
           </c-fullbox>
         </el-form-item>
         <c-col :span="24">
-          <el-form-item label="" label-width="35%">
+          <el-form-item label="">
             <c-input
               type="textarea"
               :rows="3"
@@ -316,7 +310,7 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="汇款附言(Tag 70)" label-width="35%">
+        <el-form-item label="汇款附言(Tag 70)">
           <c-input
             type="textarea"
             :rows="3"
@@ -330,7 +324,7 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="费用详情(Tag 71a)" label-width="35%">
+        <el-form-item label="费用详情(Tag 71a)">
         </el-form-item>
       </c-col>
 

src/views/Business/Gitset/Gitsetp1.vue

@@ -450,10 +450,13 @@
           ></c-input>
         </el-form-item>
       </c-col>
-      <c-col :span="2" :offset="19">
+      
+      <c-col :span="24">
+        <el-form-item>
         <c-checkbox v-model="model.Gitsetp1" disabled style="margin-left: 15px">
           创建 MT 732
         </c-checkbox>
+      </el-form-item>
       </c-col>
       <c-col :span="2" :offset="19" v-if="false">
         <c-checkbox v-model="model.Gitsetp1" disabled style="margin-left: 15px"

src/views/Business/Infbcd/Infsea.vue

@@ -232,9 +232,10 @@ export
         this.ownref = ownref
         console.log("ownref:" + ownref);
       },
-      async onChoose(code) {
+      async onChoose(code, prePageId) {
         //跳转交易
-        this.$router.history.push("/business/" + code)
+        // this.$router.history.push("/business/" + code)
+        this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
         this.$refs.childs.initdialog = false
       },
       closeTrn(refId) {

src/views/Business/Infbdd/Infsea.vue

@@ -378,7 +378,8 @@ export default {
       },
         async  onChoose(code){
             //跳转交易
-          this.$router.history.push("/business/" + code) 
+          // this.$router.history.push("/business/" + code) 
+          this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId: this.model.pageId } });
           this.$refs.childs.initdialog = false                    
         } ,
         async  getDitSelInfo(code){

src/views/Business/Infbed/Infsea.vue

@@ -403,7 +403,7 @@ export default {
           '5 15 "开立日期" 150',
           '6 16 "关闭日期" 150',
           '7 4 "申请人编号" 200',
-          '8 5 "申请人编号" 150',
+          '8 5 "申请人名称" 150',
           '9 6 "PTA主键" 150',
           '10 7 "受益人编号" 200',
           '11 8 "受益人名称" 150',
@@ -431,7 +431,8 @@ export default {
     },
     async onChoose(code) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      // this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId: this.model.pageId } });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {

src/views/Business/Infbfd/Infsea.vue

@@ -384,7 +384,8 @@ export default {
     },
     async onChoose(code) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      // this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId: this.model.pageId } });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {

src/views/Business/Infbod/Infsea.vue

@@ -237,10 +237,11 @@ export default {
       this.BotselModel.clsflg = (closedDate ?? "").trim() === "" ? "" : "C";
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
-      this.$router.history.push("/business/" + code)
-      this.$refs.childs.initdialog = false
+      // this.$router.history.push("/business/" + code)
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
+      this.$refs.childs.initdialog = false;
     },
     closeTrn(refId) {
       this.$refs[refId].doClose();

src/views/Business/Infbpd/Infsea.vue

@@ -525,9 +525,10 @@ export default {
       this.$refs.childs.initdialog = true;
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      // this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {

src/views/Business/Infbrd/Infsea.vue

@@ -426,7 +426,8 @@ export default {
   },
     async  onChoose(code){
         //跳转交易
-      this.$router.history.push("/business/" + code)
+      // this.$router.history.push("/business/" + code)
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId: this.model.pageId } });
       this.$refs.childs.initdialog = false
     } ,
     async  getDitSelInfo(code){

src/views/Business/Infled/Infsea.vue

@@ -430,8 +430,8 @@ export default {
           '1 1 "信用证编号" 130',
           '2 2 "客户经理" 100',
           '3 3 "期限日" 90',
-          '4 14 "生效日期" 150',
-          '5 13 "开立日期" 150',
+          '4 13 "开立日期" 150',
+          '5 14 "生效日期" 150',
           '6 15 "关闭日期" 150',
           '7 12 "分行名称" 150',
           '8 4 "申请人编号" 120',
@@ -464,9 +464,10 @@ export default {
       this.$refs.childs.initdialog = true;
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      // this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId} });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {

src/views/Business/Inflid/Infsea.vue

@@ -2,275 +2,116 @@
   <div class="eibs-tab">
     <c-list-search @form-reset="handleReset" @form-search="handleSearch">
       <template v-slot="searchSlot">
-        <el-form
-          class="m-table-search-form"
-          ref="paramsForm"
-          label-position="right"
-          label-width="110px"
-          size="small"
-        >
+        <el-form class="m-table-search-form" ref="paramsForm" label-position="right" label-width="110px" size="small">
           <el-row>
             <c-col :span="8">
-              <el-form-item
-                label="信用证编号"
-                prop="infcon.seaownref"
-                style="width: 100%"
-              >
-                <c-input
-                  v-model="model.infcon.seaownref"
-                  maxlength="16"
-                  placeholder="请输入信用证编号"
-                ></c-input>
+              <el-form-item label="信用证编号" prop="infcon.seaownref" style="width: 100%">
+                <c-input v-model="model.infcon.seaownref" maxlength="16" placeholder="请输入信用证编号"></c-input>
               </el-form-item>
             </c-col>
 
             <c-col :span="8">
-              <el-form-item
-                label="开立日期"
-                prop="infcon.opndatfrom"
-                style="width: 100%"
-              >
+              <el-form-item label="开立日期" prop="infcon.opndatfrom" style="width: 100%">
                 <c-col :span="11">
-                  <c-date-picker
-                    type="date"
-                    v-model="model.infcon.opndatfrom"
-                    placeholder="请选择起始日期"
-                    value-format="yyyy-MM-dd"
-                    style="width: 100%"
-                  ></c-date-picker>
+                  <c-date-picker type="date" v-model="model.infcon.opndatfrom" placeholder="请选择起始日期"
+                    value-format="yyyy-MM-dd" style="width: 100%"></c-date-picker>
                 </c-col>
                 <c-col :span="2" style="text-align: center">
                   <label style="display: inline-block; width: 100%">-</label>
                 </c-col>
                 <c-col :span="11">
-                  <c-date-picker
-                    type="date"
-                    v-model="model.infcon.opndatto"
-                    placeholder="请选择截至日期"
-                    style="width: 100%"
-                    value-format="yyyy-MM-dd"
-                  ></c-date-picker>
+                  <c-date-picker type="date" v-model="model.infcon.opndatto" placeholder="请选择截至日期" style="width: 100%"
+                    value-format="yyyy-MM-dd"></c-date-picker>
                 </c-col>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="当事人参考号"
-                prop="infcon.searef"
-                style="width: 100%"
-              >
-                <c-input
-                  v-model="model.infcon.searef"
-                  maxlength="16"
-                  placeholder="请输入当事人参考号"
-                ></c-input>
+              <el-form-item label="当事人参考号" prop="infcon.searef" style="width: 100%">
+                <c-input v-model="model.infcon.searef" maxlength="16" placeholder="请输入当事人参考号"></c-input>
               </el-form-item>
             </c-col>
           </el-row>
 
           <el-row v-show="searchSlot.searchToggle">
             <c-col :span="8">
-              <el-form-item
-                label="当事人编号"
-                prop="infcon.pty.extkey"
-                style="width: 100%"
-              >
-                <c-input
-                  v-model="model.infcon.pty.extkey"
-                  maxlength="24"
-                  placeholder="请输入当事人编号"
-                ></c-input>
+              <el-form-item label="当事人编号" prop="infcon.pty.extkey" style="width: 100%">
+                <c-input v-model="model.infcon.pty.extkey" maxlength="24" placeholder="请输入当事人编号"></c-input>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="当事人名称"
-                prop="infcon.pty.nam"
-                style="width: 100%"
-              >
-                <c-input
-                  v-model="model.infcon.pty.nam"
-                  maxlength="40"
-                  placeholder="请输入当事人名称"
-                ></c-input>
+              <el-form-item label="当事人名称" prop="infcon.pty.nam" style="width: 100%">
+                <c-input v-model="model.infcon.pty.nam" maxlength="40" placeholder="请输入当事人名称"></c-input>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="当事人BIC编码"
-                prop="infcon.seapty"
-                style="width: 100%"
-              >
-                <c-input
-                  v-model="model.infcon.seapty"
-                  maxlength="24"
-                  placeholder="当事人BIC编码"
-                ></c-input>
+              <el-form-item label="当事人BIC编码" prop="infcon.seapty" style="width: 100%">
+                <c-input v-model="model.infcon.seapty" maxlength="24" placeholder="当事人BIC编码"></c-input>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="业务简略信息"
-                prop="infcon.nam"
-                style="width: 100%"
-              >
-                <c-input
-                  v-model="model.infcon.nam"
-                  maxlength="40"
-                  placeholder="请输入业务简略信息"
-                  style="width: 100%"
-                ></c-input>
+              <el-form-item label="业务简略信息" prop="infcon.nam" style="width: 100%">
+                <c-input v-model="model.infcon.nam" maxlength="40" placeholder="请输入业务简略信息"
+                  style="width: 100%"></c-input>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="当事人角色"
-                prop="infcon.searol"
-                style="width: 100%"
-              >
-                <c-select
-                  v-model="model.infcon.searol"
-                  style="width: 100%"
-                  placeholder="请选择当事人角色"
-                  :code="codes.payrol"
-                >
+              <el-form-item label="当事人角色" prop="infcon.searol" style="width: 100%">
+                <c-select v-model="model.infcon.searol" style="width: 100%" placeholder="请选择当事人角色" :code="codes.payrol">
                 </c-select>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="客户经理"
-                prop="infcon.usr.extkey"
-                style="width: 100%"
-              >
-                <c-input
-                  v-model="model.infcon.usr.extkey"
-                  maxlength="8"
-                  placeholder="请输入客户经理"
-                ></c-input>
+              <el-form-item label="客户经理" prop="infcon.usr.extkey" style="width: 100%">
+                <c-input v-model="model.infcon.usr.extkey" maxlength="8" placeholder="请输入客户经理"></c-input>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="业务状态"
-                prop="infcon.seasta"
-                style="width: 100%"
-              >
-                <c-select
-                  v-model="model.infcon.seasta"
-                  style="width: 100%"
-                  placeholder="请选择业务状态"
-                >
-                  <el-option
-                    v-for="item in codes.seasta"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+              <el-form-item label="业务状态" prop="infcon.seasta" style="width: 100%">
+                <c-select v-model="model.infcon.seasta" style="width: 100%" placeholder="请选择业务状态">
+                  <el-option v-for="item in codes.seasta" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </c-select>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="币种"
-                prop="infcon.seacur"
-                style="width: 100%"
-              >
-                <c-select
-                  v-model="model.infcon.seacur"
-                  style="width: 100%"
-                  placeholder="请选择币种"
-                  :code="codes.cur"
-                >
-                  <el-option
-                    v-for="item in codes.seacur"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+              <el-form-item label="币种" prop="infcon.seacur" style="width: 100%">
+                <c-select v-model="model.infcon.seacur" style="width: 100%" placeholder="请选择币种" :code="codes.cur">
+                  <el-option v-for="item in codes.seacur" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </c-select>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="金额区间"
-                prop="infcon.seaamtfr"
-                style="width: 100%"
-              >
+              <el-form-item label="金额区间" prop="infcon.seaamtfr" style="width: 100%">
                 <c-col :span="11">
-                  <c-input
-                    v-model="model.infcon.seaamtfr"
-                    placeholder="请输入金额下限"
-                    style="width: 100%"
-                  ></c-input>
+                  <c-input v-model="model.infcon.seaamtfr" placeholder="请输入金额下限" style="width: 100%"></c-input>
                 </c-col>
                 <c-col :span="2" style="text-align: center">
                   <label style="display: inline-block; width: 100%">-</label>
                 </c-col>
                 <c-col :span="11">
-                  <c-input
-                    v-model="model.infcon.seaamtto"
-                    placeholder="请输入金额上限"
-                    style="width: 100%"
-                  ></c-input>
+                  <c-input v-model="model.infcon.seaamtto" placeholder="请输入金额上限" style="width: 100%"></c-input>
                 </c-col>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="保兑指示"
-                prop="seacnfdet"
-                style="width: 100%"
-              >
-                <c-select
-                  v-model="model.seacnfdet"
-                  style="width: 100%"
-                  placeholder="请选择保兑指示"
-                >
-                  <el-option
-                    v-for="item in codes.cnfins"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+              <el-form-item label="保兑指示" prop="seacnfdet" style="width: 100%">
+                <c-select v-model="model.seacnfdet" style="width: 100%" placeholder="请选择保兑指示">
+                  <el-option v-for="item in codes.cnfins" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </c-select>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="信用证类型"
-                prop="sealcrtyp"
-                style="width: 100%"
-              >
-                <c-select
-                  v-model="model.sealcrtyp"
-                  :code="codes.lcrtyp"
-                  style="width: 100%"
-                  placeholder="请选择信用证类型"
-                >
+              <el-form-item label="信用证类型" prop="sealcrtyp" style="width: 100%">
+                <c-select v-model="model.sealcrtyp" :code="codes.lcrtyp" style="width: 100%" placeholder="请选择信用证类型">
                 </c-select>
               </el-form-item>
             </c-col>
             <c-col :span="8">
-              <el-form-item
-                label="货物类型"
-                prop="seagodcod"
-                style="width: 100%"
-              >
-                <c-select
-                  v-model="model.seagodcod"
-                  style="width: 100%"
-                  placeholder="请选择货物类型"
-                >
-                  <el-option
-                    v-for="item in codes.godcod"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+              <el-form-item label="货物类型" prop="seagodcod" style="width: 100%">
+                <c-select v-model="model.seagodcod" style="width: 100%" placeholder="请选择货物类型">
+                  <el-option v-for="item in codes.godcod" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </c-select>
               </el-form-item>
@@ -281,86 +122,48 @@
     </c-list-search>
 
     <c-col :span="24" style="margin-top: 10px">
-      <c-button
-        class="medium_bcs"
-        size="medium"
-        type="primary"
-        style="margin-left: 0px"
-        title="LITOPN"
-        @click="toLitopn"
-      >
+      <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0px" title="LITOPN"
+        @click="toLitopn">
         进口信用证开立
       </c-button>
     </c-col>
     <div style="height: 90%">
       <c-col :span="24">
-        <c-istream-table
-          :list="stmData.data"
-          :columns="stmData.columns"
-          :showButtonFlg="true"
-        >
+        <c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true">
           <!-- 自定义组件里加了最右边的一列”操作“ -->
           <el-table-column fixed="right" prop="op" label="操作" width="140px">
             <template slot="header">
-              <c-col :span="11" style="text-align: center"
-                ><span>操作</span></c-col
-              >
+              <c-col :span="11" style="text-align: center"><span>操作</span></c-col>
             </template>
             <template slot-scope="scope">
               <!-- 申请一个弹出主键放在插槽，加工已渲染的数据 -->
-              <el-popover
-                placement="top-start"
-                title="历史信息"
-                width="800"
-                trigger="click"
-                :ref="'popover_' + scope.row.IDX"
-              >
-                <div
-                  style="
+              <el-popover placement="top-start" title="历史信息" width="800" trigger="click"
+                :ref="'popover_' + scope.row.IDX">
+                <div style="
                     text-align: right;
                     margin-top: -30px;
                     margin-right: 5px;
                     font-size: 16px;
-                  "
-                >
-                  <span
-                    class="el-icon-close"
-                    @click="closeTrn('popover_' + scope.row.IDX)"
-                  />
+                  ">
+                  <span class="el-icon-close" @click="closeTrn('popover_' + scope.row.IDX)" />
                 </div>
-                <c-istream-table
-                  :list="trnData.data"
-                  :columns="trnData.columns"
-                >
+                <c-istream-table :list="trnData.data" :columns="trnData.columns">
                   <el-table-column prop="op" label="操作" width="0">
                     <template slot-scope="scope">
-                      <c-button
-                        style="margin-left: 0"
-                        size="small"
-                        @click="display(scope.row['INR'])"
-                      >
+                      <c-button style="margin-left: 0" size="small" @click="display(scope.row['INR'])">
                         详情
                       </c-button>
                     </template>
                   </el-table-column>
                 </c-istream-table>
-                <c-button
-                  style="margin-left: 0"
-                  size="small"
-                  @click="getTrnInfo(scope.$index, scope.row)"
-                  slot="reference"
-                >
+                <c-button style="margin-left: 0" size="small" @click="getTrnInfo(scope.$index, scope.row)"
+                  slot="reference">
                   详情
                 </c-button>
               </el-popover>
-              <c-button
-                style="margin-left: 5px"
-                size="small"
-                type="primary"
-                @click="
+              <c-button style="margin-left: 5px" size="small" type="primary" @click="
                 getButtons(scope.row['信用证编号'], scope.row['关闭日期'])
-                "
-              >
+              ">
                 处理
               </c-button>
             </template>
@@ -369,14 +172,8 @@
       </c-col>
     </div>
 
-    <m-busbtn
-      ref="childs"
-      :ownref="ownref"
-      trnCode="litsel"
-      :model="litselModel"
-      ownrefPath="lidget.lid.ownref"
-      @onChoose="onChoose"
-    >
+    <m-busbtn ref="childs" :ownref="ownref" trnCode="litsel" :model="litselModel" ownrefPath="lidget.lid.ownref"
+      @onChoose="onChoose">
     </m-busbtn>
   </div>
 </template>
@@ -497,9 +294,10 @@ export default {
       this.$refs.childs.initdialog = true;
       console.log("ownref:" + ownref);
     },
-    async onChoose(code) {
+    async onChoose(code, prePageId) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      // this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {
@@ -528,7 +326,7 @@ export default {
       this.$router.history.push("/business/litopn");
     },
   },
-  created: function () {},
+  created: function () { },
 };
 </script>
 <style>

src/views/Business/Infltd/Infsea.vue

@@ -404,7 +404,8 @@ export default {
     },
     async onChoose(code) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      // this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId: this.model.pageId } });
       this.$refs.childs.initdialog = false;
     },
     async getLetSelInfo(code) {

src/views/Business/Inftrd/Infsea.vue

@@ -531,7 +531,8 @@ export default {
     },
     async onChoose(code) {
       //跳转交易
-      this.$router.history.push("/business/" + code);
+      // this.$router.history.push("/business/" + code);
+      this.$router.push({ name: code.charAt(0).toUpperCase() + code.substring(1), params: { prePageId } });
       this.$refs.childs.initdialog = false;
     },
     async getDitSelInfo(code) {

src/views/Business/Litdck/Litdckp.vue

@@ -209,7 +209,7 @@
           <c-select
             v-model="model.invtyp"
             style="width: 100%"
-            :code="codes.invtyp"
+            :code="codes.invtyp2"
           >
           </c-select>
         </el-form-item>

src/views/Business/Trtcan/Canp.vue

 <template>
-  <div class="eibs-tab">
+  <div class="eibs">
       <!--=================顶部=================  -->
       <c-col :span="12" style="padding-right: 20px">
         <c-form-item label="父交易参考号" prop="trdgrp.rec.pntref">
@@ -48,22 +48,16 @@
       <!-- 中左 -->
       <c-col :span="12" style="padding-right: 20px">
         <c-col :span="24">
-          <c-col :span="22">
             <c-form-item label="融资比例" prop="trdgrp.rec.pctfin">
               <c-input
                 v-model="model.trdgrp.rec.pctfin"
                 :disabled="true"
-                style="width: 100%"
+                style="width: 97%"
                 :placeholder="$t('other.please_enter') + $t('trtp0.SF000050')"
-              ></c-input>
+              ></c-input>%
             </c-form-item>
           </c-col>
 
-            <c-col :span="2" style="padding:5px; font-size: 10px;text-align: center;">
-                <span>%</span>
-            </c-col>
-          </c-col>
-
 
         <!-- <c-col :span="12" style="padding-right: 20px">
           <el-form-item label="融资金额" prop="trdgrp.cbs.max.cur">
@@ -84,23 +78,30 @@
         </c-col> -->
 
         <c-col :span="24">
-            <el-form-item label="融资金额" prop="trdgrp.cbs.max.cur">
                 <c-col :span="12">
+                  <el-form-item label="融资金额" prop="trdgrp.cbs.max.cur">
                   <c-select
                     v-model="model.trdgrp.cbs.max.cur"
                     :disabled="true"
                   >
+                    <el-option
+                      v-for="item in codes.cur"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
                   </c-select>
+                  </el-form-item>
                 </c-col>
                 <c-col :span="12">
+                  <el-form-item label-width="5px">
                   <c-input
                     v-model="model.trdgrp.cbs.max.amt"
-                    style="text-align: left; margin-left: 2px"
                     :disabled="true"
                   ></c-input>
-                </c-col>
                 </el-form-item>
                 </c-col>
+          </c-col>
 
         <!-- <c-col :span="24">
           <c-form-item label="余额" prop="trdgrp.cbs.opn1.cur">
@@ -123,17 +124,16 @@
         <c-col :span="24">
             <c-col :span="12">
               <c-form-item label="余额" prop="trdgrp.cbs.opn1.cur">
-                <c-input
+                <c-select
                   v-model="model.trdgrp.cbs.opn1.cur"
-                  maxlength="3"
+                  style="width: 100%"
                   :disabled="true"
-                ></c-input>
+                  :code="codes.cur"
+                ></c-select>
               </c-form-item>
             </c-col>
             <c-col :span="12" >
-              <el-form-item
-                style="text-align: left; margin-left: 5px"
-                label-width="0px">
+              <el-form-item label-width="5px">
                 <c-input
                   v-model="model.trdgrp.cbs.opn1.amt"
                   :disabled="true"
@@ -142,6 +142,7 @@
             </c-col>
           </c-col>
 
+
         <c-col :span="12">
           <el-form-item label="起息日期" prop="trdgrp.rec.stttendat">
             <c-date-picker

src/views/Business/Trtcan/index.vue

@@ -22,15 +22,20 @@
               <m-ovwp :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
-          <el-tab-pane label="统一授信" name="limitbody2">
+          <el-tab-pane label="统一授信" name="limitbody">
             <c-content>
-              <m-limitbody2 :model="model" :codes="codes" />
+              <m-limitbody :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
-          <el-tab-pane label="费用/账务" name="setpan,glepan">
+
+          <el-tab-pane label="费用/账务" name="engp,setpan,glepan">
               <c-content>
                 <div class="eibs-tab">
                   <el-collapse v-model="activeNames">
+                    <el-collapse-item title="表外记账" name="engp">
+                      <!-- 表外记账 -->
+                      <m-engp :model="model" :codes="codes" />
+                    </el-collapse-item>
                     <el-collapse-item title="结算" name="setpan">
                       <!-- 结算 -->
                       <m-setpan :model="model" :codes="codes" />
@@ -43,6 +48,7 @@
                 </div>
               </c-content>
             </el-tab-pane>
+
           <el-tab-pane label="备查/附言" name="addbcb">
             <c-content>
               <m-addbcb :model="model" :codes="codes" />
@@ -114,11 +120,12 @@ import Ovwp from "./Ovwp";
 import Shisuan from "./Shisuan";
 import Addbcb from "./Addbcb";
 
+import Engp from "~/views/Public/Engp";
 import Setpan from "~/views/Public/Setpan";
 import Coninfp from "~/views/Public/Coninfp";
 import Docpan from "~/views/Public/Docpan";
 import Doctre from "~/views/Public/Doctre";
-import Limitbody2 from "./Limitbody2";
+import Limitbody from "~/views/Public/Limitbody";
 import Glepan from "~/views/Public/Glepan";
 
 export default {
@@ -128,11 +135,12 @@ export default {
     "m-docpan": Docpan,
     "m-doctre": Doctre,
     "m-shisuan": Shisuan,
-    "m-limitbody2": Limitbody2,
+    "m-limitbody": Limitbody,
     "m-setpan": Setpan,
     "m-coninfp": Coninfp,
     "m-glepan": Glepan,
     "m-addbcb": Addbcb,
+    "m-engp": Engp,
   },
   provide() {
     return {
@@ -151,7 +159,7 @@ export default {
       pattern: Pattern,
       rules: null,
       codes: { ...CodeTable },
-      activeNames: ["setpan"],
+      activeNames: ["engp"],
     };
   },
   methods: {

src/views/Business/Trtopn/Cnyp.vue

 <template>
-  <div class="eibs">
+  <div class="eibs-tab">
   <el-collapse v-model="activeNames" @change="handleChange">
       <el-collapse-item title="资本项目" name="cfactlp">
           <m-cfactlp :model="model" :codes="codes" />

src/views/Business/Trtset/Ovwp1.vue

 <template>
-  <div class="eibs-tab">
+  <div class="eibs">
     <!-- <c-content :height="300"> -->
       <c-col :span="12" style="padding-right: 20px">
           <c-col :span="24">
@@ -39,25 +39,19 @@
           </c-col> -->
 
           <c-col :span="24">
-            <c-col :span="22">
               <c-form-item label="融资比例" prop="trdgrp.rec.pctfin">
                   <c-input
                     v-model="model.trdgrp.rec.pctfin"
-                    style="width: 100%"
+                    style="width: 97%"
                     :disabled="true"
                     placeholder="请输入融资比例"
-                  ></c-input>
+                  ></c-input>%
               </c-form-item>
           </c-col>
 
-            <c-col :span="2" style="padding:5px; font-size: 10px;text-align: center;">
-                <span>%</span>
-            </c-col>
-          </c-col>
-
           <c-col :span="24">
-            <el-form-item label="融资金额" prop="trdgrp.cbs.max.cur">
                 <c-col :span="12">
+                  <el-form-item label="融资金额" prop="trdgrp.cbs.max.cur">
                   <c-select
                     v-model="model.trdgrp.cbs.max.cur"
                     :disabled="true"
@@ -69,16 +63,17 @@
                       :value="item.value"
                     ></el-option>
                   </c-select>
+                  </el-form-item>
                 </c-col>
                 <c-col :span="12">
+                  <el-form-item label-width="5px">
                   <c-input
                     v-model="model.trdgrp.cbs.max.amt"
-                    style="text-align: left; margin-left: 2px"
                     :disabled="true"
                   ></c-input>
-                </c-col>
                 </el-form-item>
                 </c-col>
+          </c-col>
 
           <!-- <c-col :span="24">
             style="width: 70%"111
@@ -114,17 +109,16 @@
           <c-col :span="24">
             <c-col :span="12">
               <c-form-item label="余额" prop="trdgrp.cbs.opn1.cur">
-                <c-input
+                <c-select
                   v-model="model.trdgrp.cbs.opn1.cur"
-                  maxlength="3"
+                  style="width: 100%"
                   :disabled="true"
-                ></c-input>
+                  :code="codes.cur"
+                ></c-select>
               </c-form-item>
             </c-col>
             <c-col :span="12" >
-              <el-form-item
-                style="text-align: left; margin-left: 5px"
-                label-width="0px">
+              <el-form-item label-width="5px">
                 <c-input
                   v-model="model.trdgrp.cbs.opn1.amt"
                   :disabled="true"

src/views/Business/Trtset/index.vue

@@ -18,9 +18,9 @@
             </c-content>
           </el-tab-pane>
           <!--limmod PD000001 统一授信 -->
-          <el-tab-pane label="统一授信" name="limitbody2">
+          <el-tab-pane label="统一授信" name="limitbody">
             <c-content>
-              <m-limitbody2 :model="model" :codes="codes" />
+              <m-limitbody :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
 
@@ -118,7 +118,6 @@ import Pattern from "~/model/Trtset/Pattern";
 
 import Ovwp from "./Ovwp";
 import Shisuan from "./Shisuan";
-import Limitbody2 from "./Limitbody2";
 import Addbcb from "./Addbcb";
 
 import Engp from "~/views/Public/Engp";
@@ -127,6 +126,7 @@ import Coninfp from "~/views/Public/Coninfp";
 import Docpan from "~/views/Public/Docpan";
 import Doctre from "~/views/Public/Doctre";
 import Glepan from "~/views/Public/Glepan";
+import Limitbody from "~/views/Public/Limitbody";
 
 export default {
   name: "Trtset",
@@ -138,7 +138,7 @@ export default {
     "m-docpan": Docpan,
     "m-doctre": Doctre,
     "m-shisuan": Shisuan,
-    "m-limitbody2": Limitbody2,
+    "m-limitbody": Limitbody,
     "m-glepan": Glepan,
     "m-addbcb": Addbcb,
   },

src/views/Public/BusNavbar.vue

@@ -75,7 +75,7 @@ export default {
       let rtnmsg = await this.executeRule(`cfgfil.hotsub${i}`);
       if (rtnmsg.respCode == SUCCESS) {
         this.navcode = [];
-        this.$emit("onChoose", code.toLowerCase());
+        this.$emit("onChoose", code.toLowerCase(), this.model.pageId);
       } else {
         this.$notify.error({ title: "错误", message: "服务请求失败！" });
       }

src/views/Statics/Dbiact/index.vue

@@ -3,7 +3,7 @@
     <c-page :title="title">
       <el-form
         ref="modelForm"
-        label-width="120px"
+        label-width="150px"
         size="small"
         label-position="right"
         :model="model"

src/views/Statics/Dbiatp/AtpInfo.vue

 <template>
   <div class="eibs-tab">
     <c-col :span="12" class="col-left">
-	<c-col :span="24">
-        <el-form-item label="编号" prop="inr">
-            <c-input
-                v-model="model.inr"
-                placeholder="请输入inr"
-            >
-            </c-input>
-        </el-form-item>
-    </c-col>
-	<c-col :span="24">
-        <el-form-item label="代码" prop="cod">
+<!--	<c-col :span="24">-->
+<!--        <el-form-item label="编号" prop="inr">-->
+<!--            <c-input-->
+<!--                v-model="model.inr"-->
+<!--                placeholder="请输入编号"-->
+<!--            >-->
+<!--            </c-input>-->
+<!--        </el-form-item>-->
+<!--    </c-col>-->
+	<c-col :span="24">
+        <el-form-item label="交易配置信息代码" prop="cod">
             <c-input
                 v-model="model.cod"
-                placeholder="请输入代码"
+                placeholder="请输入交易配置信息代码"
             >
             </c-input>
         </el-form-item>
@@ -23,7 +23,7 @@
         <el-form-item label="控制标志" prop="rouflg">
             <c-input
                 v-model="model.rouflg"
-                placeholder="请输入rouflg"
+                placeholder="请输入控制标志"
             >
             </c-input>
         </el-form-item>
@@ -32,7 +32,7 @@
         <el-form-item label="业务品种" prop="bus">
             <c-input
                 v-model="model.bus"
-                placeholder="请输入bus"
+                placeholder="请输入业务品种"
             >
             </c-input>
         </el-form-item>
@@ -41,7 +41,7 @@
         <el-form-item label="创建新进程标志" prop="concreflg">
             <c-input
                 v-model="model.concreflg"
-                placeholder="请输入concreflg"
+                placeholder="请输入创建新进程标志"
             >
             </c-input>
         </el-form-item>
@@ -50,7 +50,7 @@
         <el-form-item label="处理数据标志" prop="dtaflg">
             <c-input
                 v-model="model.dtaflg"
-                placeholder="请输入dtaflg"
+                placeholder="请输入处理数据标志"
             >
             </c-input>
         </el-form-item>
@@ -59,7 +59,7 @@
         <el-form-item label="处理临时结算标志" prop="sepflg">
             <c-input
                 v-model="model.sepflg"
-                placeholder="请输入sepflg"
+                placeholder="请输入处理临时结算标志"
             >
             </c-input>
         </el-form-item>
@@ -68,7 +68,7 @@
         <el-form-item label="后台进程标志" prop="jobflg">
             <c-input
                 v-model="model.jobflg"
-                placeholder="请输入jobflg"
+                placeholder="请输入后台进程标志"
             >
             </c-input>
         </el-form-item>
@@ -77,7 +77,7 @@
         <el-form-item label="创建子合同进程" prop="subflg">
             <c-input
                 v-model="model.subflg"
-                placeholder="请输入subflg"
+                placeholder="请输入创建子合同进程"
             >
             </c-input>
         </el-form-item>
@@ -88,7 +88,7 @@
         <el-form-item label="关联表名" prop="lnkobj">
             <c-input
                 v-model="model.lnkobj"
-                placeholder="请输入lnkobj"
+                placeholder="请输入关联表名"
             >
             </c-input>
         </el-form-item>
@@ -97,43 +97,43 @@
         <el-form-item label="比较类型" prop="ccstyp">
             <c-input
                 v-model="model.ccstyp"
-                placeholder="请输入ccstyp"
-            >
-            </c-input>
-        </el-form-item>
-    </c-col>
-	<c-col :span="24">
-        <el-form-item label="版本号" prop="ver">
-            <c-input
-                v-model="model.ver"
-                placeholder="请输入ver"
+                placeholder="请输入比较类型"
             >
             </c-input>
         </el-form-item>
     </c-col>
+<!--	<c-col :span="24">-->
+<!--        <el-form-item label="版本号" prop="ver">-->
+<!--            <c-input-->
+<!--                v-model="model.ver"-->
+<!--                placeholder="请输入版本号"-->
+<!--            >-->
+<!--            </c-input>-->
+<!--        </el-form-item>-->
+<!--    </c-col>-->
 	<c-col :span="24">
         <el-form-item label="交易处理标志" prop="bustrnflg">
             <c-input
                 v-model="model.bustrnflg"
-                placeholder="请输入bustrnflg"
+                placeholder="请输入交易处理标志"
             >
             </c-input>
         </el-form-item>
     </c-col>
 	<c-col :span="24">
-        <el-form-item label="用于release的金额" prop="relamt">
+        <el-form-item label="用于释放的金额" prop="relamt">
             <c-input
                 v-model="model.relamt"
-                placeholder="请输入relamt"
+                placeholder="请输入用于释放的金额"
             >
             </c-input>
         </el-form-item>
     </c-col>
 	<c-col :span="24">
-        <el-form-item label="release规则类型" prop="reltyp">
+        <el-form-item label="释放规则类型" prop="reltyp">
             <c-input
                 v-model="model.reltyp"
-                placeholder="请输入reltyp"
+                placeholder="请输入释放规则类型"
             >
             </c-input>
         </el-form-item>
@@ -142,7 +142,7 @@
         <el-form-item label="押汇中心处理标志" prop="negflg">
             <c-input
                 v-model="model.negflg"
-                placeholder="请输入negflg"
+                placeholder="请输入押汇中心处理标志"
             >
             </c-input>
         </el-form-item>
@@ -151,7 +151,7 @@
         <el-form-item label="交易处理时间" prop="dealtim">
             <c-input
                 v-model="model.dealtim"
-                placeholder="请输入dealtim"
+                placeholder="请输入交易处理时间"
             >
             </c-input>
         </el-form-item>

src/views/Statics/Dbiatx/AtxInfo.vue

@@ -14,7 +14,7 @@
         <el-form-item label="保函文本用途" prop="atxcod">
             <c-input
                 v-model="model.atxcod"
-                placeholder="请输入atxcod"
+                placeholder="请输入保函文本用途"
             >
             </c-input>
         </el-form-item>
@@ -23,7 +23,7 @@
         <el-form-item label="保函文本类型" prop="atxtyp">
             <c-input
                 v-model="model.atxtyp"
-                placeholder="请输入atxtyp"
+                placeholder="请输入保函文本类型"
             >
             </c-input>
         </el-form-item>
@@ -32,7 +32,7 @@
         <el-form-item label="上级文本所属实体组织" prop="etgextkey">
             <c-input
                 v-model="model.etgextkey"
-                placeholder="请输入etgextkey"
+                placeholder="请输入上级文本所属实体组织"
             >
             </c-input>
         </el-form-item>
@@ -50,7 +50,7 @@
         <el-form-item label="语言" prop="uil">
             <c-input
                 v-model="model.uil"
-                placeholder="请输入uil"
+                placeholder="请输入语言"
             >
             </c-input>
         </el-form-item>
@@ -59,7 +59,7 @@
         <el-form-item label="出具目的" prop="gtxpurpos">
             <c-input
                 v-model="model.gtxpurpos"
-                placeholder="请输入gtxpurpos"
+                placeholder="请输入出具目的"
             >
             </c-input>
         </el-form-item>
@@ -68,7 +68,7 @@
         <el-form-item label="保函包含类型" prop="gtxgartyp">
             <c-input
                 v-model="model.gtxgartyp"
-                placeholder="请输入gtxgartyp"
+                placeholder="请输入保函包含类型"
             >
             </c-input>
         </el-form-item>
@@ -77,7 +77,7 @@
         <el-form-item label="保函格式" prop="gtxlegfrm">
             <c-input
                 v-model="model.gtxlegfrm"
-                placeholder="请输入gtxlegfrm"
+                placeholder="请输入保函格式"
             >
             </c-input>
         </el-form-item>
@@ -86,7 +86,7 @@
         <el-form-item label="上一级文本" prop="atxtxt">
             <c-input
                 v-model="model.atxtxt"
-                placeholder="请输入atxtxt"
+                placeholder="请输入上一级文本"
             >
             </c-input>
         </el-form-item>
@@ -99,7 +99,7 @@
         <el-form-item label="保函文本名" prop="nam">
             <c-input
                 v-model="model.nam"
-                placeholder="请输入nam"
+                placeholder="请输入保函文本名"
             >
             </c-input>
         </el-form-item>
@@ -108,7 +108,7 @@
         <el-form-item label="优先级" prop="gtxpri">
             <c-input
                 v-model="model.gtxpri"
-                placeholder="请输入gtxpri"
+                placeholder="请输入优先级"
             >
             </c-input>
         </el-form-item>
@@ -117,7 +117,7 @@
         <el-form-item label="保函无责任担保标志" prop="gtxexpflg">
             <c-input
                 v-model="model.gtxexpflg"
-                placeholder="请输入gtxexpflg"
+                placeholder="请输入保函无责任担保标志"
             >
             </c-input>
         </el-form-item>
@@ -126,7 +126,7 @@
         <el-form-item label="保函文本中的交易日期" prop="laborcdat">
             <c-input
                 v-model="model.laborcdat"
-                placeholder="请输入laborcdat"
+                placeholder="请输入保函文本中的交易日期"
             >
             </c-input>
         </el-form-item>
@@ -135,7 +135,7 @@
         <el-form-item label="包含文本中的附加信息" prop="labaddinf">
             <c-input
                 v-model="model.labaddinf"
-                placeholder="请输入labaddinf"
+                placeholder="请输入包含文本中的附加信息"
             >
             </c-input>
         </el-form-item>

src/views/Statics/Dbiatx/index.vue

@@ -136,7 +136,7 @@ export default {
           edit(this.model)
             .then((res) => {
               this.$message.success("保存成功！");
-              this.goBack()
+              this.goBack(true)
             })
             .catch((err) => {
               this.$message.error("保存失败！");

src/views/Statics/Infatp/Infsea.vue

@@ -29,7 +29,7 @@
           type="primary"
           icon="el-icon-search"
           size="small"
-          @click="onInfatpSearch()"
+          @click="onSearch()"
           >查询
         </el-button>
       </c-col>
@@ -120,6 +120,11 @@ export default {
     handleReset() {
       this.root.$refs.modelForm.resetFields();
     },
+    onSearch() {
+      this.model.pageSize = 5;
+      this.model.pageNum = 1;
+      this.onInfatpSearch();
+    },
     onInfatpSearch() {
 			queryByPage(this.model).then(res => {
         /**

src/views/Statics/Infatx/Infsea.vue

@@ -7,7 +7,7 @@
         <el-form-item label="保函文本用途" prop="atxcod">
             <c-select
                 v-model="model.atxcod"
-               placeholder="请选择atxcod"
+               placeholder="请选择保函文本用途"
                 :code="getCodesByKey('atxcod')"
             >
             </c-select>
@@ -19,7 +19,7 @@
         <el-form-item label="保函文本名" prop="nam">
             <c-input
                 v-model="model.nam"
-                placeholder="请输入nam"
+                placeholder="请输入保函文本名"
             >
             </c-input>
         </el-form-item>
@@ -33,7 +33,7 @@
         <el-form-item label="出具目的" prop="gtxpurpos">
             <c-select
                 v-model="model.gtxpurpos"
-               placeholder="请选择gtxpurpos"
+               placeholder="请选择出具目的"
                 :code="getCodesByKey('gtxpurpos')"
             >
             </c-select>
@@ -44,7 +44,7 @@
         <el-form-item label="保函包含类型" prop="gtxgartyp">
             <c-select
                 v-model="model.gtxgartyp"
-               placeholder="请选择gtxgartyp"
+               placeholder="请选择保函包含类型"
                 :code="getCodesByKey('gtxgartyp')"
             >
             </c-select>
@@ -52,10 +52,10 @@
     </c-col>
 	
 	<c-col :span="24">
-        <el-form-item label="保函格式" prop="gtxlegfrm">.
+        <el-form-item label="保函格式" prop="gtxlegfrm">
              <c-select
                 v-model="model.sealegfrm"
-               placeholder="请选择gtxlegfrm"
+               placeholder="请选择保函格式"
                 :code="getCodesByKey('gtxlegfrm')"
             >
             </c-select>
@@ -69,7 +69,7 @@
         <el-form-item label="语言" prop="gtxuil">
             <c-select
                 v-model="model.gtxuil"
-               placeholder="请选择gtxuil"
+               placeholder="请选择语言"
                 :code="getCodesByKey('gtxuil')"
             >
             </c-select>
@@ -80,7 +80,7 @@
         <el-form-item label="保函无责任担保标志" prop="gtxexpflg">
             <c-select
                 v-model="model.gtxexpflg"
-               placeholder="请选择gtxexpflg"
+               placeholder="请选择保函无责任担保标志"
                 :code="getCodesByKey('gtxexpflg')"
             >
             </c-select>
@@ -109,7 +109,7 @@
           type="primary"
           icon="el-icon-search"
           size="small"
-          @click="onInfatxSearch()"
+          @click="onSearch()"
           >查询
         </el-button>
       </c-col>
@@ -207,6 +207,11 @@ export default {
     handleReset() {
       this.root.$refs.modelForm.resetFields();
     },
+    onSearch() {
+      this.model.pageSize = 5;
+      this.model.pageNum = 1;
+      this.onInfatxSearch();
+    },
     onInfatxSearch() {
 			queryByPage(this.model).then(res => {
         /**

src/views/Statics/Infatx/index.vue

@@ -53,6 +53,7 @@ export default {
 		    gtxgartyp: "",
         //出具目的
 		    gtxpurpos: "",
+        sealegfrm: "",
         // paging
         pageNum: 1,
         pageSize: 5,

src/widget/SwiftCode/index.vue

 <template>
-  <div></div>
+  <div>
+    <el-form
+      :model="model"
+      ref="modelForm"
+      label-width="120px"
+      label-position="right"
+      size="small"
+    >
+      <c-col :span="8" class="col-left">
+        <c-col :span="24">
+          
+          <el-form-item label="银行名称" prop="nam1">
+            <c-input v-model="model.nam1" placeholder="请输入银行名称">
+            </c-input>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="银行编号" prop="extkey">
+            <c-input v-model="model.extkey" placeholder="请输入银行编号"></c-input>
+          </el-form-item>
+        </c-col>
+        
+      </c-col>
+      <c-col :span="8" class="col-left col-right">
+        <c-col :span="24">
+          <el-form-item label="街道" prop="str1">
+            <c-input
+              v-model="model.str1"
+              maxlength="34"
+              placeholder="请输入街道"
+            ></c-input>
+          </el-form-item>
+        </c-col>
+
+        <c-col :span="24">
+          <el-form-item label="BIC" prop="bic">
+            <c-select
+              v-model="model.bic"
+              placeholder="请输入BIC"
+              style="width: 100%"
+            ></c-select>
+          </el-form-item>
+        </c-col>
+        
+      </c-col>
+      <c-col :span="8" class="col-right">
+        
+        <c-col :span="24">
+          <el-form-item label="城市" prop="loctxt">
+            <c-select
+              v-model="model.loctxt"
+              style="width: 100%"
+              placeholder="请输入城市"
+            >
+            </c-select>
+          </el-form-item>
+        </c-col>
+
+        <c-col :span="24">
+          <el-form-item label="ZIP-Code" prop="loczip">
+            <c-input v-model="model.loczip" placeholder="请输入ZIP-Code"> </c-input>
+          </el-form-item>
+        </c-col>
+      </c-col>
+      <c-col :span="24" style="text-align: right">
+        <el-button size="small" @click="handleReset">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="small"
+          @click="doSearch()"
+          >查询
+        </el-button>
+      </c-col>
+    </el-form>
+    <c-col :span="24">
+      <c-paging-table
+        :data="tableData"
+        :columns="tableColumns"
+        :pageNumber="model.pageNum"
+        :pageSize="model.pageSize"
+        :total="model.total"
+        v-on:queryFunc="queryFunc"
+        :border="true"
+      >
+      </c-paging-table>
+    </c-col>
+  </div>
 </template>
 
 <script>
+import codes from "~/config/CodeTable";
+import { queryByPage } from "~/service/test/act.js";
 
 /**
  * SwiftCode查询
  */
 export default {
-	name: 'SwiftCodeQuery'
+	name: 'SwiftCodeQuery',
+  data() {
+    return {
+      tableData: [],
+      tableColumns: [
+        { label: "银行编号", prop: "extkey", width: "200" },
+        { label: "银行名称", prop: "nam1", width: "200" },
+        { label: "街道", prop: "str1", width: "100" },
+        { label: "ZIP", prop: "loczip", width: "200" },
+        { label: "城市", prop: "loctxt", width: "200" },
+        { label: "BIC", prop: "bic", width: "100" },
+      ],
+      model: {
+        // adr，查询条件的字段
+        nam1: "",
+        extkey: "",
+        str1: "",
+        bic: "",
+        loctxt: "",
+        loczip: "",
+        pageNum: 1,
+        pageSize: 5,
+        total: 0,
+      },
+    };
+  },
+  methods: {
+    handleReset() {
+      this.$refs.modelForm.resetFields();
+    },
+    doSearch() {
+      queryByPage(this.model).then((res) => {
+        const list = res.list;
+        this.tableData = list;
+        this.model.pageNum = res.pageNumber;
+        this.model.pageSize = res.pageSize;
+        this.model.total = res.total;
+      });
+    },
+    queryFunc(pageNumber, pageSize) {
+      this.model.pageNum = pageNumber;
+      this.model.pageSize = pageSize;
+      this.doSearch();
+    },
+    getCodesByKey(key) {
+      return codes[key] ?? [];
+    },
+  },
 }
 </script>