Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/config/CodeTable/index.js

@@ -1624,6 +1624,38 @@ const CodeTable = {
         { label: "即期结售/套汇", value: "FE" },
         { label: "卖方国内证", value: "DE" },
     ],
+    bustxt1: [
+        { label: " 出口类融资 ", value: "BP"},
+        { label: " Batch Collection", value: "CL"},
+        { label: " Cash Collection", value: "FC"},
+        { label: " 光票托收", value: "CC"},
+        { label: " 清偿付款", value: "CP"},
+        { label: " 出口托收", value: "BO"},
+        { label: " Export Guarantee(INT)", value: "GF"},
+        { label: "出口信用证 ", value: "LE"},
+        { label: " 出口信用证单据", value: "BE"},
+        { label: "转让信用证", value: "LT"},
+        { label: "Gurantee", value: "GI"},
+        { label: "Gurantee Claim", value: "GC"},
+        { label: "Gurantee Claim(INT)", value: "GD"},
+        { label: "Gurantee(INT)", value: "GB"},
+        { label: "进口托收", value: "BC"},
+        { label: "进口信用证", value: "LI"},
+        { label: "进口信用证单据", value: "BR"},
+        { label: "进口类融资和打包放款", value: "TR"},
+        { label: "手动合同", value: "MC"},
+        { label: "Reimbursment", value: "RM"},
+        { label: "Reimbursment Claim", value: "RC"},
+        { label: "Transfer Bills", value: "BT"},
+        { label: "Re-financing", value: "DF"},
+        { label: "出口保函", value: "GE"},
+        { label: "结售汇业务", value: "JS"},
+        { label: "买方国内证", value: "DI"},
+        { label: "买方国内证单据", value: "BD"},
+        { label: "卖方国内证", value: "DE"},
+        { label: "卖方国内证单据", value: "BF"},
+        { label: "期权业务", value: "WI"},
+    ],
     bustye: [
         { label: "02-代理进出口", value: "02" },
         { label: "03-与特殊经济区企业资金往来", value: "03" },
@@ -7733,6 +7765,24 @@ const CodeTable = {
         { label: '请求修改承诺书 (BOL,SWT)', value: 'REQAMEND' },
         { label: '自由形式承诺的修改，如从属担保人。 (BOL,SWT)', value: 'ISSAMEND' },
     ],
+
+    diatxt:[
+        {label: 'Accept decrease', value: 'ACD' },
+        {label: 'Claim payment', value: 'CLM' },
+        {label: 'Classified', value: 'CSF' },
+        {label: 'Expired', value: 'EXP' },
+        {label: 'Expiry warning', value: 'EXW' },
+        {label: 'Follow-up', value: 'FOL' },
+        {label: 'Maturity reached', value: 'MAT' },
+        {label: 'Post Booking', value: 'PLB' },
+        {label: 'Post Due', value: 'PSD' },
+        {label: '贸易单证审核', value: 'RAM' },
+        {label: 'Shipping Guarantee returned?', value: 'SGR' },
+    ],
+    dia_donflg:[
+        { label: "否", value: " " },
+        { label: "是", value: "X" },
+    ],
     swtcod: [
         { label: '/AGENT/', value: 'AGEN' },
         { label: '/COMM/', value: 'COM' },

src/model/Conres/Check.js

+import Utils from "~/utils"
+
+/**
+* Conres Check规则
+*/
+let checkObj = {
+    "ptagrp.rec.objkey"                      :null,
+}
+
+for (const key in checkObj) {
+    if (Object.hasOwnProperty.call(checkObj, key)) {
+        checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
+    }
+}
+export default checkObj
+

src/model/Conres/Default.js

+
+/**
+* Conres Default规则
+*/
+import Api from "~/service/Api";
+import Utils from "~/utils/index"
+
+export default {
+    "conget.sector"                      :Utils.defaultFunction,
+    "concnt"                      :Utils.defaultFunction,
+    "rol"                      :Utils.defaultFunction,
+    "ptagrp.rec.objkey"                      :Utils.defaultFunction,
+}
+//你可以添加自动default处理

src/model/Conres/Event.js

+import Api from "~/service/Api"
+import Utils from "~/utils"
+
+export default {
+    async onConresRescon(){
+        let rtnmsg = await this.executeRule("conres.rescon")
+        if(rtnmsg.respCode == SUCCESS)
+        {
+        //TODO 处理数据逻辑
+        this.updateModel(rtnmsg.data);
+
+        }
+        else
+        {
+        this.$notify.error({title: '错误',message: '服务请求失败！'});
+        }
+    },
+}
\ No newline at end of file

src/model/Conres/Pattern.js

+export default {
+    "ptaget.sdamod.dadsnd":[
+        {type: "string", required: false, message: "必输项"},
+        {max: 16,message:"长度不能超过16"}
+    ],
+    "ptagrp.rec.objkey":[
+        {type: "string", required: false, message: "必输项"},
+        {max: 24,message:"长度不能超过24"}
+    ],
+    "ptaget.sdamod.seainf":[
+        {type: "string", required: false, message: "必输项"},
+        {max: 3,message:"长度不能超过3"}
+    ],
+    "ptagrp.rec.nam":[
+        {type: "string", required: false, message: "必输项"},
+        {max: 40,message:"长度不能超过40"}
+    ],
+
+
+    "concnt":[
+        {type: "number", required: false, message: "必输项"},
+        {type: "number" ,max: 9999,message:"长度不能超过4"}
+    ],
+}
\ No newline at end of file

src/model/Conres/index.js

+import Api from "~/service/Api"
+import Pts from "../Common/Pts"
+
+export default class Conres{
+    constructor () {
+        this.data = {
+						ptagrp:{
+							rec:{
+								objkey:"",			//  Party No.		.ptagrp.rec.objkey
+								nam:"",			//  Party Name		.ptagrp.rec.nam
+							},
+						},
+						ptaget:{
+							sdamod:{
+								seainf:"",			//  		.ptaget.sdamod.seainf
+								dadsnd:"",			//  Drag  Drop Sender		.ptaget.sdamod.dadsnd
+							},
+						},
+						conget:{
+							sector:"",			//  Business Sector		.conget.sector
+						},
+						rol:"",			//  Role in Contract		.rol
+						concnt:"",			//  # of Reserved Ref.		.concnt
+						pageId: "",			// ctx的key
+						
+				}
+    }
+}
\ No newline at end of file

src/model/Infdia/index.js

+export default class Infdia{
+    constructor () {
+        this.data = {}
+    }
+}
\ No newline at end of file

src/service/test/apf.js

+import Api from "~/service/Api"
+
+export function queryByPage(data) {
+    return Api.post("/manager/act/queryByPage", data)
+}
+
+export function queryDetailById(inr) {
+    return Api.post(`/manager/act/queryDetailById?inr=${inr}`)
+}
+
+export function add(data) {
+    return Api.post("/manager/act/add", data)
+}
+
+export function edit(data) {
+    return Api.post("/manager/act/edit", data)
+}
+
+export function deleteById(inr) {
+    return Api.post(`/manager/act/deleteById?inr=${inr}`)
+}
+

src/service/test/dia.js

+import Api from "~/service/Api"
+
+export function queryByPage(data) {
+    return Api.post("/manager/dia/queryByPage", data)
+}
+
+export function queryById(data) {
+    return Api.post(`/manager/dia/queryById`, data)
+}
+
+export function queryDetailById(data) {
+    return Api.post(`/manager/dia/queryDetailById`, data)
+}
+
+export function add(data) {
+    return Api.post("/manager/dia/add", data)
+}
+
+export function edit(data) {
+    return Api.post("/manager/dia/edit", data)
+}
+
+export function deleteById(data) {
+    return Api.post(`/manager/dia/deleteById`, data)
+}
\ No newline at end of file

src/views/Business/BusRouter.js

@@ -221,6 +221,7 @@ import Gctcan from "./Gctcan"
 import Getfre from "./Getfre"
 
 import Gitfre from "./Gitfre"
+import Conres from "./Conres"
 import Gctrop from "./Gctrop"
 import Gctfre from "./Gctfre"
 
@@ -353,7 +354,16 @@ import Dbafee from "~/views/Statics/Dbafee";
 import Dbefee from "~/views/Statics/Dbefee";
 import Dbdfee from "~/views/Statics/Dbdfee";
 
+import Dblapf from "~/views/Statics/Dblapf";
+import Dbiapf from "~/views/Statics/Dbiapf";
+import Dbaapf from "~/views/Statics/Dbaapf";
+import Dbeapf from "~/views/Statics/Dbeapf";
+import Dbdapf from "~/views/Statics/Dbdapf";
+
+
 import Inftxm2 from "~/views/Statics/Inftxm";
+
+import Infdia from "~/views/Statics/Infdia";
 /**
  * 带有name的才会被添加进顶部的标签页里
  */
@@ -548,6 +558,7 @@ const BusRouter = [
     { path: 'gctrop', component: Gctrop, name: 'Gctrop', meta: { title: '保函索赔注销后激活' } },
     { path: 'gitdla', component: Gitdla, name: 'Gitdla', meta: { title: '减额后处理' } },
     { path: 'getfee', component: Getfee, name: 'Getfee', meta: { title: '费用结算' } },
+    { path: 'conres', component: Conres, name: 'Conres', meta: { title: '保留参考号' } },
     { path: 'gitrop', component: Gitrop, name: 'Gitrop', meta: { title: '保函注销后激活' } },
     { path: 'gctfre', component: Gctfre, name: 'Gctfre', meta: { title: '索赔自由报文' } },
 
@@ -723,5 +734,17 @@ const BusRouter = [
     { path: 'dbifee/:inr', component: Dbifee, name: 'StaticsDbifee', meta: { title: (tag) => { return '费用代码详情: ' + tag.params.inr } } },
     { path: 'dbefee/:inr', component: Dbefee, name: 'StaticsDbefee', meta: { title: (tag) => { return '费用代码修改: ' + tag.params.inr } } },
     { path: 'dbdfee/:inr', component: Dbdfee, name: 'StaticsDbdfee', meta: { title: (tag) => { return '费用代码删除: ' + tag.params.inr } } },
+
+    { path: 'infdia', component: Infdia, name: 'StaticsInfact', meta: { title: '交易备忘录查询' } },
+    { path: 'dbadia', component: Dbaact, name: 'StaticsDbaact', meta: { title: '交易备忘录新增' } },
+    { path: 'dbidia/:inr', component: Dbiact, name: 'StaticsDbiact', meta: { title: (tag) => { return '交易备忘录详情: ' + tag.params.inr } } },
+    { path: 'dbedia/:inr', component: Dbeact, name: 'StaticsDbeact', meta: { title: (tag) => { return '交易备忘录修改: ' + tag.params.inr } } },
+    { path: 'dbddia/:inr', component: Dbdact, name: 'StaticsDbdact', meta: { title: (tag) => { return '交易备忘录删除: ' + tag.params.inr } } },
+
+    { path: 'dblapf', component: Dblapf, name: 'StaticsDblapf', meta: { title: '报文格式信息查询' } },
+    { path: 'dbaapf', component: Dbaapf, name: 'StaticsDbaapf', meta: { title: '报文格式信息新增' } },
+    { path: 'dbiapf/:inr', component: Dbiapf, name: 'StaticsDbiapf', meta: { title: (tag) => { return '报文格式信息详情: ' + tag.params.inr } } },
+    { path: 'dbeapf/:inr', component: Dbeapf, name: 'StaticsDbeapf', meta: { title: (tag) => { return '报文格式信息修改: ' + tag.params.inr } } },
+    { path: 'dbdapf/:inr', component: Dbdapf, name: 'StaticsDbdapf', meta: { title: (tag) => { return '报文格式信息删除: ' + tag.params.inr } } },
 ]
 export default BusRouter
\ No newline at end of file

src/views/Business/Clttra/Sel.vue

@@ -154,13 +154,13 @@ export default {
                         show: "text",
                     },
                     {
-                        title: "balance",
+                        title: "余额",
                         width: "100px",
                         dataIndex: "amt",
                         show: "text",
                     },
                     {
-                        title: "PAY TO",
+                        title: "收款人",
                         width: "100px",
                         dataIndex: "paytoamt",
                         show: "input",

src/views/Business/Conres/Conres.vue

+<template>
+  <div class="eibs">
+    <c-row>
+        <c-col :span="12" style="padding-right: 20px">
+            <c-col :span="24">
+                <el-form-item label="当事人编号" prop="ptagrp.rec.objkey">
+                    <c-fullbox>
+                         <c-input
+                           v-model="model.ptagrp.rec.objkey"
+                           maxlength="18"
+                           
+                           @keyup.enter.native="
+                      showGridPromptDialog('ptagrp.rec.objkey', null, null, null, 'T', 'etyDialog', 6)
+                    "
+
+                           ></c-input>
+                           <!-- @keyup.enter.native="showGridPromptDialog('ptagrp.rec.objkey')" -->
+                    <template slot="footer">
+                
+                        <c-button
+                        style="margin: 0 0px 0 10px; padding: 0 0px"
+                        size="small"
+                        type="primary"
+                        @click="onBptcodSelbut1"
+                    >
+                          <i class="el-icon-info" style="font-size:15px"></i>
+                        </c-button>
+                    </template>
+                    </c-fullbox>
+                </el-form-item>
+            </c-col>
+        </c-col>
+        
+
+        <c-col :span="12" style="padding-left: 20px">
+            <c-col :span="24">
+               <c-form-item label="简略信息" prop="ptagrp.rec.nam">
+            <c-input  v-model="model.ptagrp.rec.nam" maxlength="40"  placeholder="" show-word-limit
+            disabled></c-input>
+        </c-form-item>
+       </c-col>
+        </c-col>
+    </c-row>   
+    
+
+
+
+    <c-row>
+        <c-col :span="12" style="padding-right: 20px">
+            <c-col :span="24">
+               <el-form-item label="交易形式" prop="conget.sector">
+                   <c-select v-model="model.conget.sector" style="width:100%" placeholder=""  :code="codes.bustxt1" >
+                   </c-select>
+               </el-form-item>
+       </c-col>
+                 <!-- SF000053 : Role in Contract -->
+                  
+       <c-col :span="24">
+          <el-form-item label="合同角色" prop="rol">
+              <c-select v-model="model.rol" style="width:100%" placeholder=""  :code="codes.rolall"  >
+              </c-select>
+          </el-form-item>
+       </c-col>
+                 <!-- SF000051 : # of Reserved Ref. -->
+                  
+        <c-col :span="24">
+           <c-form-item label="保留编号" prop="concnt">
+               <c-input  v-model.number="model.concnt"  placeholder=""></c-input>
+               </c-form-item>
+           </c-col>
+        </c-col>
+    </c-row>
+
+    <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
+ </c-grid-ety-prompt-dialog>
+
+       <!-- <c-col :span="12">
+        <c-form-item label="Drag  Drop Sender" prop="ptaget.sdamod.dadsnd">
+            <c-input  v-model="model.ptaget.sdamod.dadsnd"  :placeholder="$t('other.please_enter')+'Drag  Drop Sender'"></c-input>
+        </c-form-item>
+       </c-col> -->
+                 <!-- S0000050 : Party No. -->
+                  
+       <!-- <c-col :span="12">
+        <c-form-item :label="$t('conres.S0000050')" prop="ptagrp.rec.objkey">
+            <c-input  v-model="model.ptagrp.rec.objkey" maxlength="24"  :placeholder="$t('other.please_enter')+$t('conres.S0000050')"></c-input>
+        </c-form-item>
+       </c-col> -->
+                  
+       <!-- <c-col :span="12">
+        <c-form-item label="" prop="ptaget.sdamod.seainf">
+            <c-input  v-model="model.ptaget.sdamod.seainf"  :placeholder="$t('other.please_enter')+''"></c-input>
+        </c-form-item>
+       </c-col> -->
+                 <!-- S0000049 : Party Name -->
+                  
+       <!-- <c-col :span="12">
+        <c-form-item :label="$t('conres.S0000049')" prop="ptagrp.rec.nam">
+            <c-input  v-model="model.ptagrp.rec.nam" maxlength="40"  :placeholder="$t('other.please_enter')+$t('conres.S0000049')"></c-input>
+        </c-form-item>
+       </c-col> -->
+                 <!-- SF000046 : Business Sector -->
+                  
+       <!-- <c-col :span="12">
+        <el-form-item :label="$t('conres.SF000046')" prop="conget.sector">
+            <c-select v-model="model.conget.sector" style="width:100%" :placeholder="$t('other.please_enter')+$t('conres.SF000046')">
+              </c-select>
+        </el-form-item>
+       </c-col> -->
+                 <!-- SF000053 : Role in Contract -->
+                  
+       <!-- <c-col :span="12">
+        <el-form-item :label="$t('conres.SF000053')" prop="rol">
+            <c-select v-model="model.rol" style="width:100%" :placeholder="$t('other.please_enter')+$t('conres.SF000053')">
+              </c-select>
+        </el-form-item>
+       </c-col> -->
+                 <!-- SF000051 : # of Reserved Ref. -->
+                  
+       <!-- <c-col :span="12">
+        <c-form-item :label="$t('conres.SF000051')" prop="concnt">
+            <c-input  v-model="model.concnt"  :placeholder="$t('other.please_enter')+$t('conres.SF000051')"></c-input>
+        </c-form-item>
+       </c-col> -->
+  </div>
+</template>
+<script>
+import Api from "~/service/Api"
+import commonProcess from "~/mixin/commonProcess";
+import CodeTable from "~/config/CodeTable"
+
+
+export default {
+    inject: ['root'],
+    props:["model","codes"],
+    mixins: [commonProcess],
+    data(){
+        return {
+            codes: {
+                ...CodeTable
+            },
+        }
+    },
+    methods:{
+        
+
+    },
+    created:function(){
+
+    }
+}
+</script>
+<style>
+
+</style>

src/views/Business/Conres/Ovwp.vue

+<template>
+  <div class="eibs-tab">
+    <el-collapse v-model="activeNames" @change="handleChange">
+
+      <el-collapse-item title="概要" name="conres">
+        <m-conres :model="model" :codes="codes" />
+      </el-collapse-item>
+    </el-collapse>
+  </div>
+</template>
+<script>
+import Api from "~/service/Api";
+import commonProcess from "~/mixin/commonProcess";
+import CodeTable from "~/config/CodeTable";
+import Event from "~/model/Conres/Event";
+import Conres from "./Conres"
+
+
+export default {
+  components: {
+    'm-conres': Conres,
+    
+  },
+  inject: ["root"],
+  props: ["model", "codes"],
+  mixins: [commonProcess],
+  data() {
+    return {
+      activeNames: ["conres"],
+    };
+  },
+  methods: {
+    ...Event,
+    handleChange(val) {
+        console.log(val);
+      },
+  },
+  created: function () {},
+  computed: {
+  },
+};
+</script>
+<style>
+.marginLable {
+  padding-left: 160px;
+}
+</style>

src/views/Business/Conres/index.vue

+<template>
+  <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">
+                   <!--conres PD000044 Reserving References -->
+           <el-tab-pane label="业务信息" name="ovwp">
+            <c-content>
+                <m-ovwp :model="model" :codes="codes"/> 
+            </c-content> 
+           </el-tab-pane>
+       </c-tabs>
+       <c-grid-ety-prompt-dialog
+        ref="etyDialog"
+        :promptData="promptData"
+        @select-ety="selectEty"
+      >
+      </c-grid-ety-prompt-dialog>
+      <c-grid-ety-prompt-dialog
+          ref="doxpDialog"
+          :isPty="false"
+          :promptData="promptData"
+          @select-ety="selectMsg"
+      >
+      </c-grid-ety-prompt-dialog>
+      <!-- <c-function-btn
+        :handleSubmit="handleSubmit"
+      >
+      </c-function-btn> -->
+       <div class="m-Btn-eContainer" >
+        <div class="m-funcBtn-eContainer">
+          <el-button type="primary" size="small" @click="onConresRescon()"><span>保留</span></el-button>
+          <el-button size="small" @click="handleCancel"><span>退出</span></el-button>
+        </div>
+       </div>
+    </el-form>
+    </c-page>
+  </div>
+</template>
+<script>
+import Api from "~/service/Api"
+import CodeTable from "~/config/CodeTable"
+import Conres from "~/model/Conres"
+import commonProcess from "~/mixin/commonProcess"
+import commonFuncs from "~/mixin/commonFuncs";
+import Event from "~/model/Conres/Event"
+import Check from "~/model/Conres/Check"
+import Default from "~/model/Conres/Default"
+import Pattern from "~/model/Conres/Pattern"
+import Ovwp from "./Ovwp"
+
+
+
+
+export default {
+    name: "Conres",
+    components:{
+        "m-ovwp" : Ovwp,
+    },
+    provide() {
+        return {
+            root: this
+        }
+    },
+    mixins: [commonProcess,commonFuncs],    // 里面包含了Default、Check等的公共处理
+    data(){
+        return {
+            tabVal: "ovwp",
+            trnName: "conres",
+            model: new Conres().data,
+            checkRules: Check,
+            defaultRules: Default,
+            pattern: Pattern,
+            rules: null,
+            codes: {
+                ...CodeTable
+            },
+        }
+    },
+    methods:{
+        ...Event,
+        handleCancel: function() {
+      this.$confirm("确认退出？", "", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(res => {
+          // this.$router.back();
+          this.$store.dispatch("TagsView/delView", this.$route)
+          this.handleExit && this.handleExit()
+          if (this.$route.query && this.$route.query.routeParams) {
+            setTimeout(() => {
+              this.$router.back()
+            }, 500)
+          } 
+          else {
+            setTimeout(() => {
+              this.$router.push('/home')
+            }, 500)
+          }
+        })
+        .catch(() => {});
+    },
+    },
+    created:async function(){
+        console.log("进入conres交易");
+        let rtnmsg = await this.init({})
+        if(rtnmsg.respCode == SUCCESS)
+        {
+           this.updateModel(rtnmsg.data)
+           //TODO 处理数据逻辑
+
+        }
+        else
+        {
+            this.$notify.error({title: '错误',message: '服务请求失败！'});
+        }
+    }
+}
+</script>
+<style>
+.m-Btn-eContainer {
+  display: flex; /*flex布局*/
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: center;
+  align-items: flex-start;
+  /* height: 24px; */
+  text-align: center;
+  margin-right:10px;
+}
+
+.m-funcBtn-eContainer button {
+    order: 1;
+}
+
+.m-funcBtn-eContainer .el-button--primary {
+    margin: 0px 10px 0px 0px;
+    border: 1px solid #0D4FBD;
+    border-radius: 0px;
+}
+
+.m-funcBtn-eContainer .el-button--default {
+  /* background-image: linear-gradient(#fff,#dedede); */
+  margin: 0px 10px 0px 0px;
+  border: 1px solid #ccc;
+  border-radius: 0px;
+}
+
+.m-Btn-eContainer .el-button--small,.m-Btn-eContainer .el-button--small.is-round {
+  padding: 10px 30px !important;
+  font-size: 16px;
+  height: 40px;
+  font-weight:bold;
+}
+</style>

src/views/Business/Fctopn/Opnp1.vue

@@ -27,6 +27,7 @@
                 v-model="model.fcdgrp.apl.pts.nam"
                 maxlength="40"
                 placeholder="请输入"
+                disabled
               ></c-input>
             </el-form-item>
           </c-col>
@@ -37,6 +38,7 @@
                 v-model="model.fcdgrp.apl.pta.nam1"
                 maxlength="40"
                 placeholder="请输入Externally Visible Name of Address"
+                disabled
               ></c-input>
             </el-form-item>
           </c-col>
@@ -139,7 +141,7 @@ export default {
       columns: [
 				"0 1 \"INR\" 100",
 				"1 2 \"Own Reference\" 150",
-				"2 3 \"收取日期\" auto 4 7",
+				"2 3 \"收取日期\" 150 4 7",
 				"3 4 \"Cur\" 100",
 				"4 5 \"Relevant Amount\" 150 2 8:1 2 5",
 				"5 6 \"机构号\" 120",

src/views/Business/Gctfee/Feep.vue

@@ -115,7 +115,7 @@
         </el-form-item>
       </c-col>
 
-      <!-- <c-col :span="24" v-if="model.gidgrp.rec.inr != '' && model.gidgrp.rec.liaflg != ''">
+      <c-col :span="24" v-if="model.gctp0.lialab != ''">
         <el-form-item
           label="日期"
           prop="gctp0.lialab"
@@ -123,12 +123,12 @@
           <c-date-picker
             disabled
             type="date"
-            v-model="model.gctp0.lialab"
+            v-model="model.gctp0.liadat"
             style="width: 100%"
             placeholder="请选择日期"
           ></c-date-picker>
         </el-form-item>
-      </c-col> -->
+      </c-col>
 
       <c-col :span="24">
         <el-form-item label="索赔日期" prop="gcdgrp.rec.clmdat">

src/views/Business/Gitenc/Dnfp.vue

@@ -81,10 +81,23 @@
        
        <!-- S0000111 : 起存金额 -->      
        <c-col :span="24">
+         <c-col :span="21">
            <c-form-item label="起存金额" prop="dnfenc.qicuje">
              <c-input  v-model="model.dnfenc.qicuje"  placeholder="请输入起存金额"></c-input>
            </c-form-item>
          </c-col>
+          <c-col :span="3">
+           <c-button
+            style="margin: 0px 0px 0px 20px"
+            size="small"
+            type="primary"
+            disabled
+          >
+            获取
+           </c-button>
+          </c-col>
+         </c-col>
+       
 
        <!-- S0000104 : 帐户余额 -->     
        <c-col :span="24">

src/views/Layout/SideMenu.vue

@@ -201,6 +201,7 @@ export default {
         { inifrm: "infpty", ininam: "客户信息查询", pntmiu: "10" },
         { inifrm: "inftrl", ininam: "交易权限查询", pntmiu: "10" },
         { inifrm: "infusr", ininam: "柜员信息查询", pntmiu: "10" },
+        { inifrm: "infdia", ininam: "交易备忘录查询", pntmiu: "10" },
         { inifrm: "inftxm2", ininam: "固定格式文本查询", pntmiu: "10"},
         // { inifrm: "gitset", ininam: "进口保函赔付", pntmiu: "13" },
         // { inifrm: "gitcrq", ininam: "进口保函索赔登记", pntmiu: "13" },

src/views/Review/Business/ReviewConres.vue

+<template>
+  <ReviewWrapper>
+    <Conres></Conres>
+  </ReviewWrapper>
+</template>
+
+<script>
+import Conres from "~/views/Business/Conres";
+import { ReviewWrapper } from "~/components/gj-common.min.js";
+
+export default {
+  name: "ReviewConres",
+  components: { ReviewWrapper, Conres },
+  created() {},
+  mounted() {},
+};
+</script>
+
+<style></style>
\ No newline at end of file

src/views/Review/ReviewRouter.js

@@ -125,6 +125,7 @@ import ReviewGitenc from "./Business/ReviewGitenc.vue";
 import ReviewGiteng from "./Business/ReviewGiteng.vue";
 import ReviewGitplb from "./Business/ReviewGitplb.vue";
 import ReviewGitadd from "./Business/ReviewGitadd.vue";
+import ReviewConres from "./Business/ReviewConres.vue";
 import ReviewGitdla from "./Business/ReviewGitdla.vue";
 
 import ReviewBttrcl from "./Business/ReviewBttrcl.vue";
@@ -283,6 +284,7 @@ const ReviewRouter = [
     { path: "gitplb", component: ReviewGitplb, name: "ReviewGitplb", meta: { title: "复核-Gitplb" } },
     { path: "gitfre", component: ReviewGitfre, name: "ReviewGitfre", meta: { title: "复核-Gitfre" } },
     { path: "gitadd", component: ReviewGitadd, name: "ReviewGitadd", meta: { title: "复核-Gitadd" } },
+    { path: "conres", component: ReviewConres, name: "ReviewConres", meta: { title: "复核-Conres" } },
     { path: "gitdla", component: ReviewGitdla, name: "ReviewGitdla", meta: { title: "复核-Gitdla" } },
 
     { path: "bttrcl", component: ReviewBttrcl, name: "ReviewBttrcl", meta: { title: "复核-Bttrcl" } },

src/views/Statics/Dbaapf/index.vue

+<template>
+	<m-apf ref="apf" title="dbaapf" type="add"></m-apf>
+</template>
+
+<script>
+import Dbiapf from "~/views/Statics/Dbiapf";
+
+export default {
+  name: "StaticsDbaapf",
+	components: {
+		"m-apf": Dbiapf
+	},
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbacup/index.vue

+<template>
+	<m-cup ref="cup" title="dbacup" type="add"></m-cup>
+</template>
+
+<script>
+import Dbicup from "~/views/Statics/Dbicup";
+
+export default {
+  name: "StaticsDbacup",
+	components: {
+		"m-cup": Dbicup
+	},
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbadia/index.vue

+<template>
+	<m-dia title="dbadia" type="add"></m-dia>
+</template>
+
+<script>
+import Dbidia from "~/views/Statics/Dbidia";
+
+export default {
+  name: "StaticsDbadia",
+	components: {
+		"m-dia": Dbidia
+	},
+  data() {
+    return {};
+  },
+  mounted() {
+  }
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbatxm/index.vue

@@ -14,9 +14,9 @@ export default {
     return {};
   },
   mounted() {
-    this.$refs.fec.rules['fecList'] = [
-      { type: 'array', required: true, min: 1, message: '地址信息栏不能为空' }
-    ]
+    // this.$refs.fec.rules['fecList'] = [
+    //   { type: 'array', required: true, min: 1, message: '地址信息栏不能为空' }
+    // ]
   }
 };
 </script>

src/views/Statics/Dbdapf/index.vue

+<template>
+	<m-apf title="dbdapf" type="delete"></m-apf>
+</template>
+
+<script>
+import Dbiapf from "~/views/Statics/Dbiapf";
+
+export default {
+  name: "StaticsDbdapf",
+	components: {
+		"m-apf": Dbiapf
+	},
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbdcup/index.vue

+<template>
+	<m-cup title="dbdcup" type="delete"></m-cup>
+</template>
+
+<script>
+import Dbicup from "~/views/Statics/Dbicup";
+
+export default {
+  name: "StaticsDbdcup",
+	components: {
+		"m-cup": Dbicup
+	},
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbddia/index.vue

+<template>
+	<m-dia title="dbddia" type="delete"></m-dia>
+</template>
+
+<script>
+import Dbidia from "~/views/Statics/Dbidia";
+
+export default {
+  name: "StaticsDbddia",
+	components: {
+		"m-dia": Dbidia
+	},
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbeapf/index.vue

+<template>
+	<m-apf title="dbeapf" type="edit"></m-apf>
+</template>
+
+<script>
+import Dbiapf from "~/views/Statics/Dbiapf";
+
+export default {
+  name: "StaticsDbeapf",
+	components: {
+		"m-apf": Dbiapf
+	},
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbecup/index.vue

+<template>
+	<m-cup title="dbecup" type="edit"></m-cup>
+</template>
+
+<script>
+import Dbicup from "~/views/Statics/Dbicup";
+
+export default {
+  name: "StaticsDbecup",
+	components: {
+		"m-cup": Dbicup
+	},
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbedia/index.vue

+<template>
+	<m-dia title="dbedia" type="edit"></m-dia>
+</template>
+
+<script>
+import Dbidia from "~/views/Statics/Dbidia";
+
+export default {
+  name: "StaticsDbedia",
+	components: {
+		"m-dia": Dbidia
+	},
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbiapf/Apf.js

+export default class Apf {
+	constructor() {
+		this.data = {
+			inr: "",
+            cod: "",
+            typ: "",
+            cnt: "",
+            edtflg: "",
+            tef: "",
+            pri: "",
+            ver: "",
+		}
+	}
+}
+
+export const Pattern = {
+	"inr": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 8, "message": "最大长度8个字符", "trigger": "blur" }
+	],
+	"cod": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
+	],
+	"typ": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" }
+	],
+	"cnt": [
+		{ "required": true, "message": "必输项", "trigger": "blur" },
+		{ "pattern": /^-?\d{0,4}$/, "message": "整数不能超过4位", "trigger": "blur" }
+	],
+	"edtflg": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+	],
+	"tef": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" }
+	],
+	"pri": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 2, "message": "最大长度2个字符", "trigger": "blur" }
+	]
+}
+
+

src/views/Statics/Dbiapf/ApfInfo.vue

+<template>
+  <div class="eibs-tab">
+    <c-col :span="12" style="padding-right: 20px;">
+      <c-col :span="24">
+        <el-form-item label="样式设置" prop="cod">
+          <c-input v-model="model.cod" placeholder="请输入样式设置"> </c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="类型" prop="typ">
+          <c-input v-model="model.typ" placeholder="请输入类型"> </c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="数量" prop="cnt">
+          <c-input v-model="model.cnt" placeholder="请输入数量"> </c-input>
+        </el-form-item>
+      </c-col>
+    </c-col>
+    <c-col :span="12" style="padding-left: 20px;">
+      <c-col :span="24">
+        <el-form-item label="编辑标志" prop="edtflg">
+          <c-input v-model="model.edtflg" placeholder="请输入编辑标志"> </c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="所用纸张类型" prop="tef">
+          <c-input v-model="model.tef" placeholder="请输入所用纸张类型"> </c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="优先级" prop="pri">
+          <c-input v-model="model.pri" 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>
+  </div>
+</template>
+  
+<script>
+import codes from "~/config/CodeTable";
+export default {
+  name: "",
+  props: ["model"],
+  data() {
+    return {};
+  },
+};
+</script>
+  
+  <style>
+</style>
\ No newline at end of file

src/views/Statics/Dbiapf/index.vue

+<template>
+    <div class="eContainer">
+      <c-page :title="title">
+        <el-form
+          ref="modelForm"
+          label-width="160px"
+          size="small"
+          label-position="right"
+          :model="model"
+          :rules="rules"
+          :validate-on-rule-change="false"
+          :disabled="isDisabled"
+        >
+          <c-tabs v-model="tabVal" ref="elment" type="card">
+            <el-tab-pane label="基本信息" name="apf">
+              <c-content>
+                <m-apf-info :model="model" />
+              </c-content>
+            </el-tab-pane>
+          </c-tabs>
+        </el-form>
+        <div style="text-align: center">
+          <c-button
+            type="primary"
+            style="margin-right: 10px"
+            @click="commitAdd"
+            v-if="type === 'add'"
+            >提 交</c-button
+          >
+          <c-button
+            type="primary"
+            style="margin-right: 10px"
+            @click="commitEdit"
+            v-if="type === 'edit'"
+            >提 交</c-button
+          >
+          <c-button
+            type="primary"
+            style="margin-right: 10px"
+            @click="commitDelete"
+            v-if="type === 'delete'"
+            >提 交</c-button
+          >
+          <c-button type="primary" @click="goBack">返 回</c-button>
+        </div>
+      </c-page>
+    </div>
+  </template>
+  
+  <script>
+  import Utils from "~/utils";
+  import Apf, { Pattern } from "./Apf.js";
+  
+  import ApfInfo from "./ApfInfo.vue";
+  
+  import { queryDetailById, add, edit, deleteById } from "~/service/test/apf.js";
+  
+  export default {
+    name: "StaticsDbiapf",
+    components: {
+      "m-apf-info": ApfInfo,
+    },
+    provide() {
+      return {
+        root: this,
+      };
+    },
+    props: {
+          type: {
+              type: String,
+              default: "info"
+          },
+          title: {
+              type: String,
+              default: "dbiapf"
+          }
+      },
+    data() {
+      return {
+        model: new Apf().data,
+        tabVal: "apf",
+        rules: Pattern,
+      };
+    },
+    computed: {
+      isDisabled() {
+        return this.type === "info" || this.type === "delete";
+      },
+    },
+    created() {
+      if (this.type !== "add") {
+        const inr = this.$route.params.inr;
+        queryDetailById(inr).then((res) => {
+          if (res.inr) {
+            this.model = res;
+          } else {
+            this.$message.error("客户不存在")
+          }
+        });
+      }
+    },
+    methods: {
+      commitAdd() {
+        this.$refs.modelForm.validate((validated) => {
+          if (validated) {
+            add(this.model)
+              .then((res) => {
+                this.$message.success("保存成功！");
+                this.goBack(true)
+              })
+              .catch((err) => {
+                this.$message.error("保存失败！");
+              });
+          } else {
+            Utils.formValidateTips(this.$refs.modelForm.fields)
+          }
+        });
+      },
+      commitEdit() {
+        this.$refs.modelForm.validate((validated) => {
+          if (validated) {
+            edit(this.model)
+              .then((res) => {
+                this.$message.success("保存成功！");
+                this.goBack()
+              })
+              .catch((err) => {
+                this.$message.error("保存失败！");
+              });
+          } else {
+            Utils.formValidateTips(this.$refs.modelForm.fields)
+          }
+        });
+      },
+      commitDelete() {
+        this.$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deleteById(this.model.inr)
+              .then((res) => {
+                this.$message.success("删除成功！");
+                this.goBack(true)
+              })
+              .catch((err) => {
+                this.$message.error("删除失败！");
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      },
+      /**
+       * update 是否更新infapf的查询列表
+       */
+      goBack(update) {
+        this.$store.dispatch("TagsView/delView", this.$route);
+        this.$router.push({ name: "StaticsDblapf", params: { update } });
+      },
+  
+    },
+  };
+  </script>
+  
+  <style>
+  </style>
\ No newline at end of file

src/views/Statics/Dbibch/BchInfo.vue

@@ -249,7 +249,7 @@
             </c-input>
         </el-form-item>
     </c-col>
-	<c-col :span="24">
+	<!-- <c-col :span="24">
         <el-form-item label="收单行系统机构代号" prop="tid">
             <c-input
                 v-model="model.tid"
@@ -257,7 +257,7 @@
             >
             </c-input>
         </el-form-item>
-    </c-col>
+    </c-col> -->
 	<c-col :span="24">
         <el-form-item label="国内地区码" prop="tid">
             <c-input

src/views/Statics/Dbicup/Bopcur.js

+export default class Bopcur {
+    constructor() {
+        this.data = {
+            inr: "",
+            cod: "",
+            numcod: "",
+            txt: "",
+            ver: "",
+        }
+    }
+}
+
+export const Pattern = {
+	"inr": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 8, "message": "最大长度8个字符", "trigger": "blur" }
+	],
+	"cod": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" }
+	],
+	"numcod": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" }
+	],
+	"txt": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 50, "message": "最大长度50个字符", "trigger": "blur" }
+	],
+}
\ No newline at end of file

src/views/Statics/Dbicup/CupInfo.vue

+<template>
+  <div class="eibs-tab">
+    <c-col :span="12" class="col-left">
+      <c-col :span="24">
+        <el-form-item label="cod" prop="cod">
+          <c-input v-model="model.cod" placeholder="请输入cod"> </c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="numcod" prop="numcod">
+          <c-input v-model="model.numcod" placeholder="请输入numcod"> </c-input>
+        </el-form-item>
+      </c-col>
+    </c-col>
+
+    <c-col :span="12" class="col-right">
+      <c-col :span="24">
+        <el-form-item label="txt" prop="txt">
+          <c-input v-model="model.txt" placeholder="请输入txt"> </c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="ver" prop="ver">
+          <c-input v-model="model.ver" placeholder="请输入ver"> </c-input>
+        </el-form-item>
+      </c-col>
+    </c-col>
+  </div>
+</template>
+    
+  <script>
+export default {
+  name: "",
+  props: ["model"],
+  data() {
+    return {};
+  },
+};
+</script>
+    
+  <style>
+</style>
\ No newline at end of file

src/views/Statics/Dbicup/index.vue

+<template>
+  <div class="eContainer">
+    <c-page :title="title">
+      <el-form
+        ref="modelForm"
+        label-width="120px"
+        size="small"
+        label-position="right"
+        :model="model"
+        :rules="rules"
+        :validate-on-rule-change="false"
+        :disabled="isDisabled"
+      >
+        <c-tabs v-model="tabVal" ref="elment" type="card">
+          <el-tab-pane label="基本信息" name="cup">
+            <c-content>
+              <m-cup-info :model="model" />
+            </c-content>
+          </el-tab-pane>
+        </c-tabs>
+      </el-form>
+
+      <div style="text-align: center">
+        <c-button
+          type="primary"
+          style="margin-right: 10px"
+          @click="commitAdd"
+          v-if="type === 'add'"
+          >提 交</c-button
+        >
+        <c-button
+          type="primary"
+          style="margin-right: 10px"
+          @click="commitEdit"
+          v-if="type === 'edit'"
+          >提 交</c-button
+        >
+        <c-button
+          type="primary"
+          style="margin-right: 10px"
+          @click="commitDelete"
+          v-if="type === 'delete'"
+          >提 交</c-button
+        >
+        <c-button type="primary" @click="goBack">返 回</c-button>
+      </div>
+    </c-page>
+  </div>
+</template>
+
+<script>
+import Utils from "~/utils";
+import Bopcur, { Pattern } from "./Bopcur.js";
+
+import CupInfo from "./CupInfo.vue";
+
+import { queryById, add, edit, deleteById } from "~/service/test/bopcur.js";
+
+export default {
+  name: "StaticsDbicup",
+  components: {
+    "m-cup-info": CupInfo,
+  },
+  provide() {
+    return {
+      root: this,
+    };
+  },
+  props: {
+		type: {
+			type: String,
+			default: "info"
+		},
+		title: {
+			type: String,
+			default: "dbicup"
+		}
+	},
+  data() {
+    return {
+      model: new Bopcur().data,
+      tabVal: "cup",
+      rules: Pattern,
+    };
+  },
+  computed: {
+    isDisabled() {
+      return this.type === "info" || this.type === "delete";
+    },
+  },
+  created() {
+    if (this.type !== "add") {
+      const inr = this.$route.params.inr;
+      queryById(inr).then((res) => {
+        if (res.inr) {
+          this.model = res;
+        } else {
+          this.$message.error("客户不存在")
+        }
+      });
+    }
+  },
+  methods: {
+    commitAdd() {
+      this.$refs.modelForm.validate((validated) => {
+        if (validated) {
+          add(this.model)
+            .then((res) => {
+              this.$message.success("保存成功！");
+              this.goBack(true)
+            })
+            .catch((err) => {
+              this.$message.error("保存失败！");
+            });
+        } else {
+          Utils.formValidateTips(this.$refs.modelForm.fields)
+        }
+      });
+    },
+    commitEdit() {
+      this.$refs.modelForm.validate((validated) => {
+        if (validated) {
+          edit(this.model)
+            .then((res) => {
+              this.$message.success("保存成功！");
+              this.goBack(true)
+            })
+            .catch((err) => {
+              this.$message.error("保存失败！");
+            });
+        } else {
+          Utils.formValidateTips(this.$refs.modelForm.fields)
+        }
+      });
+    },
+    commitDelete() {
+      this.$confirm("是否确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteById(this.model.inr)
+            .then((res) => {
+              this.$message.success("删除成功！");
+              this.goBack(true)
+            })
+            .catch((err) => {
+              this.$message.error("删除失败！");
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    /**
+     * update 是否更新infcup的查询列表
+     */
+    goBack(update) {
+      this.$store.dispatch("TagsView/delView", this.$route);
+      this.$router.push({ name: "StaticsInfcup", params: { update } });
+    },
+
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbidia/Dia.js

+export default class Dia {
+    constructor() {
+        this.data = {
+            inr: "",
+            bchkey: "",
+            trn: "",
+            relcur: "",
+            relamt: "",
+            ver: "",
+            relflg: "",
+        }
+    }
+}
+
+export const Pattern = {
+	"cod": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" }
+	],
+	"objref": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 16, "message": "最大长度16个字符", "trigger": "blur" }
+	],
+	"ownusr": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 8, "message": "最大长度8个字符", "trigger": "blur" }
+	],
+	"ownusg": [
+		{ "required": true, "message": "必输项", "trigger": "blur" },
+		{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
+	],
+	"frm": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
+	],
+	"usr": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 8, "message": "最大长度8个字符", "trigger": "blur" }
+	],
+}

src/views/Statics/Dbidia/DiaInfo.vue

+<template>
+    <div class="eibs-tab">
+        <!-- =============================================左边=========================================== -->
+
+    <c-col :span="12" class="col-left">
+      <c-col :span="24">
+        <el-form-item label="Business Sector" prop="subObjTyp">
+          <c-select style="width: 100%" v-model="model.subObjTyp" placeholder="请选择Business Sector" :code="getCodesByKey('bustxt')">
+          </c-select>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="Reference No." prop="objref">
+          <c-input v-model="model.objref" style="width: 100%" placeholder="请输入Reference No"> </c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="Description" prop="ownrefDesc">
+          <c-input v-model="model.ownrefDesc" style="width: 100%" placeholder="请输入Description"> </c-input>
+        </el-form-item>
+      </c-col>
+      <!-- <c-col :span="24">
+        <el-form-item label="Start Transaction" prop="frm">
+          <c-input v-model="model.frm" placeholder="请输入账号" > </c-input>
+        </el-form-item>
+      </c-col> -->
+      <c-col :span="24">
+        <el-form-item label="Description" prop="frm">
+          <c-select style="width: 100%" v-model="model.frm" placeholder="请选择Description" :code="getCodesByKey('atptxt')">
+          </c-select>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="Description" prop="nam">
+          <c-input v-model="model.nam" style="width: 100%" placeholder="请输入Description">
+          </c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="Detailed Information" prop="inftxt">
+          <c-input v-model="model.inftxt" placeholder="请输入Detailed Information" > </c-input>
+        </el-form-item>
+      </c-col>
+    </c-col>
+    <!-- =============================================右边=========================================== -->
+    <c-col :span="12" class="col-right">
+      <c-col :span="24">
+        <el-form-item label="User" prop="ownusr">
+          <c-input v-model="model.ownusr" placeholder="请输入User" > </c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="Group" prop="ownusg">
+          <c-select style="width: 100%" v-model="model.ownusg" placeholder="请选择Group" :code="getCodesByKey('usgtxt')">
+          </c-select>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="Entered/Modified by" prop="usr">
+          <c-input v-model="model.usr" placeholder="请输入Entered/Modified by" >
+          </c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="entry Done" prop="donflg">
+          <c-select style="width: 100%" v-model="model.donflg" placeholder="请选择entry Done" :code="getCodesByKey('dia_donflg')">
+          </c-select>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="Diary Reason" prop="cod">
+          <c-select style="width: 100%" v-model="model.cod" placeholder="请选择Diary Reason" :code="getCodesByKey('diatxt')">
+          </c-select>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="Date of Diary" prop="dat">
+          <c-date-picker type="date"  v-model="model.dat" style="width:100%"  placeholder="请选择Date of Diary"></c-date-picker>
+        </el-form-item>
+      </c-col>
+    </c-col>
+  </div>
+</template>
+
+<script>
+import codes from "~/config/CodeTable";
+export default {
+  name: '',
+  props: ['model'],
+  data() {
+    return {
+    }
+  },
+
+  mounted() {},
+
+  methods: {
+    getCodesByKey(key) {
+      return codes[key] ?? [];
+    },
+  },
+}
+</script>
+
+<style></style>

src/views/Statics/Dbidia/index.vue

+<template>
+    <div class="eContainer">
+      <c-page :title="title">
+        <el-form
+          ref="modelForm"
+          label-width="120px"
+          size="small"
+          label-position="right"
+          :model="model"
+          :rules="rules"
+          :validate-on-rule-change="false"
+          :disabled="isDisabled"
+        >
+          <c-tabs v-model="tabVal" ref="elment" type="card">
+            <el-tab-pane label="交易备忘录查询" name="dia">
+              <c-content>
+                <m-dia-info :model="model" />
+              </c-content>
+            </el-tab-pane>
+          </c-tabs>
+        </el-form>
+        <div style="text-align: center">
+          <c-button
+            type="primary"
+            style="margin-right: 10px"
+            @click="commitAdd"
+            v-if="type === 'add'"
+            >提 交</c-button
+          >
+          <c-button
+            type="primary"
+            style="margin-right: 10px"
+            @click="commitEdit"
+            v-if="type === 'edit'"
+            >提 交</c-button
+          >
+          <c-button
+            type="primary"
+            style="margin-right: 10px"
+            @click="commitDelete"
+            v-if="type === 'delete'"
+            >提 交</c-button
+          >
+          <c-button type="primary" @click="goBack">返 回</c-button>
+        </div>
+      </c-page>
+    </div>
+  </template>
+  
+  <script>
+  import Utils from "~/utils";
+  import Dia, { Pattern } from "./Dia.js";
+  
+  import DiaInfo from "./DiaInfo.vue";
+  
+  import { queryById, add, edit, deleteById, queryDetailById } from "~/service/test/dia.js";
+  
+  export default {
+    name: "StaticsDbidia",
+    components: {
+      "m-dia-info": DiaInfo,
+    },
+    provide() {
+      return {
+        root: this,
+      };
+    },
+    props: {
+          type: {
+              type: String,
+              default: "info"
+          },
+          title: {
+              type: String,
+              default: "dbidia"
+          }
+      },
+    data() {
+      return {
+        model: new Dia().data,
+        tabVal: "dia",
+        rules: Pattern,
+      };
+    },
+    computed: {
+      isDisabled() {
+        return this.type === "info" || this.type === "delete";
+      },
+    },
+    created() {
+      if (this.type !== "add") {
+        const data = {"inr":this.$route.params.inr};
+        queryDetailById(data).then((res) => {
+          if (res.inr) {  
+            this.model = res;
+          } else {
+            this.$message.error("数据不存在")
+          }
+        });
+      }
+    },
+    methods: {
+      commitAdd() {
+        this.$refs.modelForm.validate((validated) => {
+          if (validated) {
+            add(this.model)
+              .then((res) => {
+                this.$message.success("保存成功！");
+                this.goBack(true)
+              })
+              .catch((err) => {
+                this.$message.error("保存失败！");
+              });
+          } else {
+            Utils.formValidateTips(this.$refs.modelForm.fields)
+          }
+        });
+      },
+      commitEdit() {
+        this.$refs.modelForm.validate((validated) => {
+          if (validated) {
+            edit(this.model)
+              .then((res) => {
+                this.$message.success("保存成功！");
+                this.goBack(true)
+              })
+              .catch((err) => {
+                this.$message.error("保存失败！");
+              });
+          } else {
+            Utils.formValidateTips(this.$refs.modelForm.fields)
+          }
+        });
+      },
+      commitDelete() {
+        this.$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            let data = {"inr":this.model.inr}
+            deleteById(data)
+              .then((res) => {
+                this.$message.success("删除成功！");
+                this.goBack(true)
+              })
+              .catch((err) => {
+                this.$message.error("删除失败！");
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      },
+      /**
+       * update 是否更新infdia的查询列表
+       */
+      goBack(update) {
+        this.$store.dispatch("TagsView/delView", this.$route);
+        this.$router.push({ name: "StaticsInfdia", params: { update } });
+      },
+  
+    },
+  };
+  </script>
+  
+  <style>
+  </style>
\ No newline at end of file

src/views/Statics/Dbifee/FeeInfo.vue

@@ -13,22 +13,22 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="相关金额类型" prop="reltir">
+        <el-form-item label="计算费用相关的金额类型" prop="reltir">
           <c-select
             style="width: 100%"
             v-model="model.reltir"
-            placeholder="请选择相关金额类型"
+            placeholder="请选择计算费用相关的金额类型"
             :code="getCodesByKey('calcbs')"
           >
           </c-select>
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="SWIFT报文描述" prop="sftcod">
+        <el-form-item label="SWIFT报文费用代码" prop="sftcod">
           <c-select
             style="width: 100%"
             v-model="model.sftcod"
-            placeholder="请选择SWIFT报文类型"
+            placeholder="请选择SWIFT报文费用代码"
             :code="getCodesByKey('swtcod')"
           >
           </c-select>
@@ -57,7 +57,7 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-          <el-form-item label="是否收入" prop="incflgFee">
+          <el-form-item label="是否计入收费标志" prop="incflgFee">
               <c-select style="width: 100%"
                 v-model="model.incflg"
                 :code="getCodesByKey('incflgFee')"
@@ -66,19 +66,19 @@
           </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="支付此费用的默认角色" prop="rol">
+        <el-form-item label="默认付费角色" prop="rol">
           <c-select
             style="width: 100%"
             v-model="model.rol"
-            placeholder="请选择支付此费用的角色"
+            placeholder="请选择默认付费角色"
             :code="getCodesByKey('rol')"
           >
           </c-select>
         </el-form-item>
        </c-col>
       <c-col :span="24">
-        <el-form-item label="账号" prop="acc">
-          <c-input v-model="model.acc" placeholder="请输入账号"> </c-input>
+        <el-form-item label="费用账号" prop="acc">
+          <c-input v-model="model.acc" placeholder="请输入费用账号"> </c-input>
         </el-form-item>
       </c-col>
     </c-col>
@@ -93,41 +93,41 @@
           </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="循环收费账号" prop="accacr">
-          <c-input v-model="model.accacr" placeholder="请输入循环收费账号">
+        <el-form-item label="计提摊销账号" prop="accacr">
+          <c-input v-model="model.accacr" placeholder="请输入计提摊销账号">
           </c-input>
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="有关交易及业务部门" prop="reltrn">
-            <c-input  v-model="model.reltrn" maxlength="40"  placeholder="请输入有关交易及业务部门"></c-input>
+        <el-form-item label="相关的交易名称或者业务品种" prop="reltrn">
+            <c-input  v-model="model.reltrn" maxlength="40"  placeholder="请输入相关的交易名称或者业务品种"></c-input>
         </el-form-item>
        </c-col>
        <c-col :span="24">
-        <el-form-item label="开始日期" prop="begdat">
+        <el-form-item label="费用生效日期" prop="begdat">
             <c-date-picker type="date"  v-model="model.begdat" style="width:100%"  placeholder="请选择开始日期"></c-date-picker>
         </el-form-item>
        </c-col>
                                    
        <c-col :span="24">
-        <el-form-item label="结束日期" prop="enddat">
+        <el-form-item label="费用失效日期" prop="enddat">
             <c-date-picker type="date"  v-model="model.enddat" style="width:100%"  placeholder="请选择结束日期"></c-date-picker>
         </el-form-item>
        </c-col>
                                    
        <c-col :span="24">
-        <el-form-item label="费用分组" prop="grpcod">
+        <el-form-item label="费用组代码" prop="grpcod">
             <c-select 
             v-model="model.grpcod" 
             style="width:100%" 
-            placeholder="请选择费用的组" 
+            placeholder="请选择费用组代码" 
             :code="getCodesByKey('grpcod')"
             >
               </c-select>
         </el-form-item>
        </c-col>
        <c-col :span="24">
-        <el-form-item label="价税分离" prop="taxflg" placeholder="是/否">
+        <el-form-item label="价税分离标志" prop="taxflg" placeholder="是/否">
           <c-select
             style="width: 100%"
             v-model="model.taxflg"
@@ -137,8 +137,8 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="传真账号" prop="taxacc">
-            <c-input  v-model="model.taxacc" maxlength="34"  placeholder="请输入传真账号"></c-input>
+        <el-form-item label="税则账号" prop="taxacc">
+            <c-input  v-model="model.taxacc" maxlength="34"  placeholder="请输入税则账号"></c-input>
         </el-form-item>
        </c-col>
     </c-col>

src/views/Statics/Dbitxm/Txm.js

@@ -17,8 +17,20 @@ export const Pattern = {
     { required: true, message: "必输项", type: "string", trigger: "blur" },
     { max: 8, message: "最大长度8个字符", trigger: "blur" },
   ],
-  extkey: [{ max: 17, message: "最大长度17个字符", trigger: "blur" }],
-  nam: [{ max: 40, message: "最大长度40个字符", trigger: "blur" }],
-  uil: [{ max: 2, message: "最大长度2个字符", trigger: "blur" }],
-  etgextkey: [{ max: 8, message: "最大长度8个字符", trigger: "blur" }],
+  extkey: [
+    { required: true, message: "必输项", type: "string", trigger: "blur" },
+    { max: 17, message: "最大长度8个字符", trigger: "blur" },
+  ],
+  nam: [
+    { required: true, message: "必输项", type: "string", trigger: "blur" },
+    { max: 40, message: "最大长度40个字符", trigger: "blur" },
+  ],
+  uil: [
+    { required: true, message: "必输项", type: "string", trigger: "blur" },
+    { max: 2, message: "最大长度2个字符", trigger: "blur" },
+  ],
+  etgextkey: [
+    { required: true, message: "必输项", type: "string", trigger: "blur" },
+    { max: 8, message: "最大长度8个字符", trigger: "blur" },
+  ],
 };

src/views/Statics/Dbitxm/TxmInfo.vue

 <template>
     <div class="eibs-tab">
         <c-col :span="12" class="col-left">
-            <el-form-item label="INR" prop="inr" v-if="type !== 'add'">
+            <!-- <el-form-item label="INR" prop="inr" v-if="type !== 'add'">
                 <c-input v-model="model.inr" placeholder="请输入主键" :disabled="type === 'edit'">
                 </c-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="名称" prop="nam">
                 <c-input v-model="model.nam" placeholder="请输入名称">
                 </c-input>
@@ -15,14 +15,14 @@
                     </el-option>
                 </c-select>
             </el-form-item> -->
-            <el-form-item label="实体组" prop="etgextkey">
+            <!-- <el-form-item label="实体组" prop="etgextkey">
                 <c-input v-model="model.etgextkey" placeholder="请输入实体组">
                 </c-input>
-            </el-form-item>
+            </el-form-item> -->
         </c-col>
         <c-col :span="12" class="col-right">
-            <el-form-item label="EXTKEY" prop="extkey">
-                <c-input v-model="model.extkey" placeholder="请输入外键">
+            <el-form-item label="条款模板关键字" prop="extkey">
+                <c-input v-model="model.extkey" placeholder="请输入条款模板关键字" >
                 </c-input>
             </el-form-item>
             <el-form-item label="语言" prop="uil" style="width:100%">

src/views/Statics/Dblapf/Infsea.vue

+<template>
+  <div class="eibs-tab">
+    <c-col :span="12" style="padding-right: 20px">
+      <c-col :span="24">
+        <el-form-item label="样式设置" prop="cod">
+          <c-input v-model="model.cod" placeholder="请输入样式设置"> </c-input>
+        </el-form-item>
+      </c-col>
+    </c-col>
+
+    <c-col :span="12" style="padding-left: 20px">
+      <c-col :span="24">
+        <el-form-item label="类型" prop="typ">
+          <c-input v-model="model.typ" placeholder="请输入类型"> </c-input>
+        </el-form-item>
+      </c-col>
+    </c-col>
+    <c-col :span="24">
+      <c-col :span="12" style="text-align: left">
+        <el-button type="primary" size="small" @click="apfAdd">新增</el-button>
+      </c-col>
+      <c-col :span="12" style="text-align: right">
+        <el-button size="small" @click="handleReset">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="small"
+          @click="onSearch()"
+          >查询
+        </el-button>
+      </c-col>
+    </c-col>
+    <c-col :span="24">
+      <c-paging-table
+        :data="apfData"
+        :columns="apfColumns"
+        :pageNumber="model.pageNum"
+        :pageSize="model.pageSize"
+        :total="model.total"
+        v-on:queryFunc="queryFunc"
+        :border="true"
+      >
+        <c-table-column fixed="right" prop="op" label="操作" width="240px">
+          <template slot-scope="{ scope }">
+            <c-button
+              style="margin-left: 0"
+              size="small"
+              @click="apfInfo(scope.$index, scope.row)"
+              >详情</c-button
+            >
+            <c-button
+              style="margin-left: 5px"
+              size="small"
+              type="primary"
+              @click="apfEdit(scope.$index, scope.row)"
+              >修改</c-button
+            >
+            <c-button
+              size="small"
+              style="margin-left: 5px"
+              @click="apfDelete(scope.$index, scope.row)"
+              >删除</c-button
+            >
+            <el-popover placement="top-start" width="50" trigger="click">
+              <ul class="table-button-item-list">
+                <li>
+                  <c-button size="small" style="margin-left: 0">指派</c-button>
+                </li>
+                <li>
+                  <c-button size="small" style="margin-left: 0">删除</c-button>
+                </li>
+              </ul>
+              <a
+                slot="reference"
+                href="javascript:void(0)"
+                style="margin-left: 5px"
+              >
+                <i class="el-icon-more"></i>
+              </a>
+            </el-popover>
+          </template>
+        </c-table-column>
+      </c-paging-table>
+    </c-col>
+  </div>
+</template>
+  
+  <script>
+import codes from "~/config/CodeTable";
+
+import { queryByPage } from "~/service/test/apf.js";
+
+export default {
+  name: "",
+  props: ["model"],
+  inject: ["root"],
+  data() {
+    return {
+      apfData: [],
+      apfColumns: [
+        { label: "样式设置", prop: "cod", width: "auto" },
+        { label: "类型", prop: "typ", width: "auto" },
+        { label: "数量", prop: "cnt", width: "auto" },
+        { label: "编辑标志", prop: "edtflg", width: "auto" },
+        { label: "所用纸张类型", prop: "tef", width: "auto" },
+        { label: "优先级", prop: "pri", width: "auto" },
+        { label: "版本号", prop: "ver", width: "auto" },
+      ],
+    };
+  },
+  computed: {},
+  activated() {
+    const { update } = this.$route.params;
+    if (update) {
+      this.onInfapfSearch();
+    }
+  },
+  methods: {
+    handleReset() {
+      this.root.$refs.modelForm.resetFields();
+    },
+    onSearch() {
+      this.model.pageSize = 5;
+      this.model.pageNum = 1;
+      this.onInfapfSearch();
+    },
+    onInfapfSearch() {
+      queryByPage(this.model).then((res) => {
+        /**
+         * pageNumber: 0
+         * pageSize:	0
+         * total: 69
+         * totalPage: 0
+         */
+        const list = res.list;
+        this.apfData = 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.onInfapfSearch();
+    },
+    apfAdd() {
+      this.$router.push(`/statics/dbaapf`);
+    },
+    apfInfo(index, row) {
+      this.$router.push(`/statics/dbiapf/${row.inr}`);
+    },
+    apfEdit(index, row) {
+      this.$router.push(`/statics/dbeapf/${row.inr}`);
+    },
+    apfDelete(index, row) {
+      this.$router.push(`/statics/dbdapf/${row.inr}`);
+    },
+  },
+};
+</script>
+  
+  <style scoped>
+.table-button-item-list {
+  padding: 0;
+  margin: 0;
+}
+.table-button-item-list li {
+  list-style: none;
+  padding: 5px 0;
+  text-align: center;
+  color: #606266;
+  cursor: pointer;
+}
+</style>
+  
\ No newline at end of file

src/views/Statics/Dblapf/index.vue

+<template>
+    <div class="eContainer">
+      <c-page title="报文格式信息查询">
+        <el-form
+          :model="model"
+          ref="modelForm"
+          label-width="120px"
+          label-position="right"
+          size="small"
+        >
+          <c-tabs v-model="tabVal" ref="elment" type="card">
+            <!--PD000039 -->
+            <el-tab-pane label="报文格式信息查询" name="infsea">
+              <c-content>
+                <m-infsea :model="model" ref="infsea" />
+              </c-content>
+            </el-tab-pane>
+          </c-tabs>
+        </el-form>
+      </c-page>
+    </div>
+  </template>
+  
+  <script>
+  import Infsea from "./Infsea";
+  
+  export default {
+    name: "StaticsDblapf",
+    components: {
+      "m-infsea": Infsea,
+    },
+    provide() {
+      return {
+        root: this,
+      };
+    },
+    data() {
+      return {
+        tabVal: "infsea",
+        model: {
+          // apf
+          bchkey: "",
+          trn: "",
+          relcur: "",
+          relamt: "",
+          ver: "",
+          relflg: "",
+          // paging
+          pageNum: 1,
+          pageSize: 5,
+          total: 0,
+        },
+      };
+    },
+  };
+  </script>
+  
+  <style></style>
+  
\ No newline at end of file

src/views/Statics/Infcup/Infsea.vue

@@ -2,38 +2,23 @@
   <div class="eibs-tab">
     <c-col :span="12" class="col-left">
       <c-col :span="24">
-        <el-form-item label="机构编码" prop="bchkey">
-          <c-input v-model="model.bchkey" placeholder="请输入机构编码"> </c-input>
-        </el-form-item>
-      </c-col>    
-      <c-col :span="24">
-        <el-form-item label="授权货币" prop="relcur">
-          <c-select v-model="model.relcur" placeholder="请选择授权货币" :code="relcur" style="width:100%">
-          </c-select>
-        </el-form-item>
-      </c-col>
-      <c-col :span="24">
-        <el-form-item label="授权金额" prop="relamt">
-          <c-input v-model="model.relamt" placeholder="请输入授权金额"> </c-input>
+        <el-form-item label="cod" prop="cod">
+          <c-input v-model="model.cod" placeholder="请输入cod"> </c-input>
         </el-form-item>
       </c-col>
     </c-col>
 
     <c-col :span="12" class="col-right">
       <c-col :span="24">
-        <el-form-item label="交易代码" prop="trn">
-          <c-input v-model="model.trn" placeholder="请输入交易代码"> </c-input>
-        </el-form-item>
-      </c-col>
-      <c-col :span="24">
-        <el-form-item label="交易属性" prop="relflg">
-          <c-input v-model="model.relflg" placeholder="请输入交易属性"> </c-input>
+        <el-form-item label="numcod" prop="numcod">
+          <c-input v-model="model.numcod" placeholder="请输入numcod"> </c-input>
         </el-form-item>
       </c-col>
     </c-col>
+
     <c-col :span="24">
       <c-col :span="12" style="text-align: left">
-        <el-button type="primary" size="small" @click="trlAdd">新增</el-button>
+        <el-button type="primary" size="small" @click="cupAdd">新增</el-button>
       </c-col>
       <c-col :span="12" style="text-align: right">
         <el-button size="small" @click="handleReset">重置</el-button>
@@ -48,8 +33,8 @@
     </c-col>
     <c-col :span="24">
       <c-paging-table
-        :data="trlData"
-        :columns="trlColumns"
+        :data="cupData"
+        :columns="cupColumns"
         :pageNumber="model.pageNum"
         :pageSize="model.pageSize"
         :total="model.total"
@@ -61,20 +46,20 @@
             <c-button
               style="margin-left: 0"
               size="small"
-              @click="trlInfo(scope.$index, scope.row)"
+              @click="cupInfo(scope.$index, scope.row)"
               >详情</c-button
             >
             <c-button
               style="margin-left: 5px"
               size="small"
               type="primary"
-              @click="trlEdit(scope.$index, scope.row)"
+              @click="cupEdit(scope.$index, scope.row)"
               >修改</c-button
             >
             <c-button
               size="small"
               style="margin-left: 5px"
-              @click="trlDelete(scope.$index, scope.row)"
+              @click="cupDelete(scope.$index, scope.row)"
               >删除</c-button
             >
             <el-popover placement="top-start" width="50" trigger="click">
@@ -104,7 +89,7 @@
 <script>
 import codes from "~/config/CodeTable";
 
-import { queryByPage } from "~/service/test/trl.js";
+import { queryByPage } from "~/service/test/bopcur.js";
 
 export default {
   name: "",
@@ -112,44 +97,20 @@ export default {
   inject: ["root"],
   data() {
     return {
-      trlData: [],
-      trlColumns: [
-        { label: "机构编码", prop: "bchkey", width: "auto" },
-        { label: "交易代码", prop: "trn", width: "auto" },
-        { label: "授权货币", prop: "relcur", width: "auto" },
-        { label: "授权金额", prop: "relamt", width: "auto" },
-        { label: "交易属性", prop: "relflg", width: "auto" },
-      ],
-      relcur: [
-        { label: "AUD 澳大利亚元", value: "AUD" },
-        { label: "CAD 加拿大元", value: "CAD" },
-        { label: "CHF 瑞士法郎", value: "CHF" },
-        { label: "CNY 人民币", value: "CNY" },
-        { label: "DKK 丹麦克朗", value: "DKK" },
-        { 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" },
+      cupData: [],
+      cupColumns: [
+        { label: "cod", prop: "cod", width: "auto" },
+        { label: "numcod", prop: "numcod", width: "auto" },
+        { label: "txt", prop: "txt", width: "auto" },
+        { label: "ver", prop: "ver", width: "auto" },
       ],
     };
   },
-  computed: {
-  },
+  computed: {},
   activated() {
     const { update } = this.$route.params;
     if (update) {
-      this.onInftrlSearch();
+      this.onInfcupSearch();
     }
   },
   methods: {
@@ -159,9 +120,9 @@ export default {
     onSearch() {
       this.model.pageSize = 5;
       this.model.pageNum = 1;
-      this.onInftrlSearch();
+      this.onInfcupSearch();
     },
-    onInftrlSearch() {
+    onInfcupSearch() {
       queryByPage(this.model).then((res) => {
         /**
          * pageNumber: 0
@@ -170,7 +131,7 @@ export default {
          * totalPage: 0
          */
         const list = res.list;
-        this.trlData = list;
+        this.cupData = list;
         this.model.pageNum = res.pageNumber;
         this.model.pageSize = res.pageSize;
         this.model.total = res.total;
@@ -179,19 +140,19 @@ export default {
     queryFunc(pageNumber, pageSize) {
       this.model.pageNum = pageNumber;
       this.model.pageSize = pageSize;
-      this.onInftrlSearch();
+      this.onInfcupSearch();
     },
-    trlAdd() {
-      this.$router.push(`/statics/dbatrl`);
+    cupAdd() {
+      this.$router.push(`/statics/dbacup`);
     },
-    trlInfo(index, row) {
-      this.$router.push(`/statics/dbitrl/${row.inr}`);
+    cupInfo(index, row) {
+      this.$router.push(`/statics/dbicup/${row.inr}`);
     },
-    trlEdit(index, row) {
-      this.$router.push(`/statics/dbetrl/${row.inr}`);
+    cupEdit(index, row) {
+      this.$router.push(`/statics/dbecup/${row.inr}`);
     },
-    trlDelete(index, row) {
-      this.$router.push(`/statics/dbdtrl/${row.inr}`);
+    cupDelete(index, row) {
+      this.$router.push(`/statics/dbdcup/${row.inr}`);
     },
   },
 };

src/views/Statics/Infcup/index.vue

 <template>
   <div class="eContainer">
-    <c-page title="复核级别查询">
+    <c-page title="查询申报币种信息">
       <el-form
         :model="model"
         ref="modelForm"
@@ -10,7 +10,7 @@
       >
         <c-tabs v-model="tabVal" ref="elment" type="card">
           <!--PD000039 -->
-          <el-tab-pane label="复核级别查询" name="infsea">
+          <el-tab-pane label="查询申报币种信息" name="infsea">
             <c-content>
               <m-infsea :model="model" ref="infsea" />
             </c-content>
@@ -25,7 +25,7 @@
 import Infsea from "./Infsea";
 
 export default {
-  name: "StaticsInftrl",
+  name: "StaticsInfcup",
   components: {
     "m-infsea": Infsea,
   },
@@ -38,13 +38,9 @@ export default {
     return {
       tabVal: "infsea",
       model: {
-        // trl
-        bchkey: "",
-        trn: "",
-        relcur: "",
-        relamt: "",
-        ver: "",
-        relflg: "",
+        // bopcur
+        cod: "",
+        numcod: "",
         // paging
         pageNum: 1,
         pageSize: 5,

src/views/Statics/Infdia/Infsea.vue

+<template>
+    <div class="eibs-tab">
+    
+     <c-col :span="12" class="col-left">
+        <c-col :span="24">
+          <el-form-item label="Reason" prop="cod">
+            <c-select style="width: 100%" v-model="model.cod" placeholder="请选择Reason" :code="getCodesByKey('diatxt')">
+          </c-select>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="Reference" prop="objref">
+            <c-input v-model="model.objref" placeholder="请输入Reference" style="width: 100%">
+            </c-input>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="User" prop="ownusr">
+            <c-input v-model="model.ownusr" placeholder="请输入User" style="width: 100%">
+            </c-input>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="Status" prop="donflg">
+            <c-select style="width: 100%" v-model="model.donflg" placeholder="请选择Status" :code="getCodesByKey('dia_donflg')">
+          </c-select>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="Group" prop="ownusg">
+            <c-input v-model="model.ownusg" placeholder="请输入Group" style="width: 100%">
+            </c-input>
+          </el-form-item>
+        </c-col>
+      </c-col>
+      <!------------- 右 ---------->
+      <c-col :span="12" class="col-right">
+        <c-col :span="24">
+          <el-form-item label="From" prop="datFrom">
+            <c-date-picker type="date"  v-model="model.datFrom" style="width:100%"  placeholder="请选择开始日期"></c-date-picker>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="To" prop="datTo">
+            <c-date-picker type="date"  v-model="model.datTo" style="width:100%"  placeholder="请选择结束日期"></c-date-picker>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="Start Transaction" prop="frm">
+            <c-select style="width: 100%" v-model="model.frm" placeholder="请选择Start Transaction" :code="getCodesByKey('atptxt')">
+          </c-select>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="Entered By" prop="usr">
+            <c-input v-model="model.usr" placeholder="请输入Entered By" style="width: 100%">
+            </c-input>
+          </el-form-item>
+        </c-col>
+      </c-col>
+  
+      <c-col :span="24">
+        <c-col :span="12" style="text-align: left">
+          <el-button type="primary" size="small" @click="diaAdd">新增</el-button>
+        </c-col>
+        <c-col :span="12" style="text-align: right">
+          <el-button size="small" @click="handleReset">重置</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="small"
+            @click="onSearch()"
+            >查询
+          </el-button>
+        </c-col>
+      </c-col>
+      <c-col :span="24">
+        <c-paging-table 
+          :data="diaData"
+          :columns="diaColumns"
+          :pageNumber="model.pageNum"
+          :pageSize="model.pageSize"
+          :total="model.total"
+          v-on:queryFunc="queryFunc"
+          :border="true"
+        >
+          <c-table-column fixed="right" prop="op" label="操作" width="240px">
+            <template slot-scope="{ scope }">
+              <c-button
+                style="margin-left: 0"
+                size="small"
+                @click="diaInfo(scope.$index, scope.row)"
+                >详情</c-button
+              >
+              <c-button
+                style="margin-left: 5px"
+                size="small"
+                type="primary"
+                @click="diaEdit(scope.$index, scope.row)"
+                >修改</c-button
+              >
+              <c-button
+                size="small"
+                style="margin-left: 5px"
+                @click="diaDelete(scope.$index, scope.row)"
+                >删除</c-button
+              >
+              <el-popover placement="top-start" width="50" trigger="click">
+                <ul class="table-button-item-list">
+                  <li>
+                    <c-button size="small" style="margin-left: 0">指派</c-button>
+                  </li>
+                  <li>
+                    <c-button size="small" style="margin-left: 0">删除</c-button>
+                  </li>
+                </ul>
+                <a
+                  slot="reference"
+                  href="javascript:void(0)"
+                  style="margin-left: 5px"
+                >
+                  <i class="el-icon-more"></i>
+                </a>
+              </el-popover>
+            </template>
+          </c-table-column>
+        </c-paging-table>
+      </c-col>
+    </div>
+  </template>
+  
+  <script>
+  import codes from "~/config/CodeTable";
+  
+  import { queryByPage } from "~/service/test/dia.js";
+  
+  export default {
+    name: "",
+    props: ["model"],
+    inject: ["root"],
+    data() {
+      return {
+        diaData: [],
+        diaColumns: [
+                  { label: 'Date', prop: 'dat', width: 'auto' },
+                  { label: 'Reason', prop: 'codCn', width: 'auto' },
+                  { label: 'Reference', prop: 'objref', width: 'auto' },
+                  { label: 'Description', prop: 'nam', width: 'auto' },
+                  { label: 'Transaction', prop: 'frm', width: 'auto' },
+                  { label: 'User', prop: 'ownusr', width: 'auto' },
+                  { label: 'Group', prop: 'ownusg', width: 'auto' },
+                  { label: 'Status', prop: 'donflgCn', width: 'auto' },	
+              ],
+      };
+    },
+    computed: {
+    },
+    activated() {
+      const { update } = this.$route.params
+      if (update) {
+        this.onInfdiaSearch()
+      }
+    },
+    methods: {
+      getCodesByKey(key) {
+        return codes[key] ?? [];
+      },
+      handleReset() {
+        this.root.$refs.modelForm.resetFields();
+      },
+      onSearch() {
+        this.model.pageSize = 5;
+        this.model.pageNum = 1;
+        this.onInfdiaSearch();
+      },
+      onInfdiaSearch() {
+              queryByPage(this.model).then(res => {
+          /**
+           * pageNumber: 0
+           * pageSize:	0
+           * total: 69
+           * totalPage: 0
+           */
+          const list = res.list
+          Object.keys(list).forEach((item) => {
+            let obj = list[item]
+            let codArr = codes['diatxt'].filter((i) => {
+                return i.value == obj.cod
+            })
+            obj.codCn = codArr[0].label
+            let donflgArr = codes['dia_donflg'].filter((i) => {
+                return i.value == obj.donflg
+            })
+            obj.donflgCn = donflgArr[0].label
+          })
+          this.diaData = 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.onInfdiaSearch()
+      },
+      diatypeChange(val) {
+        this.model.fectyp = val;
+      },
+      diaCodesByKey(key) {
+        return codes[key] ?? [];
+      },
+      diaAdd() {
+              this.$router.push(`/statics/dbadia`)
+          },
+      diaInfo(index, row) {
+              this.$router.push(`/statics/dbidia/${row.inr}`)
+          },
+      diaEdit(index, row) {
+              this.$router.push(`/statics/dbedia/${row.inr}`)
+          },
+      diaDelete(index, row) {
+              this.$router.push(`/statics/dbddia/${row.inr}`)
+          },
+    },
+  };
+  </script>
+  
+  <style scoped>
+  .table-button-item-list {
+    padding: 0;
+    margin: 0;
+  }
+  .table-button-item-list li {
+    list-style: none;
+    padding: 5px 0;
+    text-align: center;
+    color: #606266;
+    cursor: pointer;
+  }</style>
+  
\ No newline at end of file

src/views/Statics/Infdia/index.vue

+<template>
+    <div class="eContainer">
+      <c-page title="交易备忘录查询">
+        <el-form :model="model" ref="modelForm" label-width="120px" label-position="right" size="small">
+          <c-tabs v-model="tabVal" ref="elment" type="card">
+            <!--PD000039 -->
+            <el-tab-pane label="查询面板" name="infsea">
+              <c-content>
+                <m-infsea :model="model" ref="infsea" />
+              </c-content>
+            </el-tab-pane>
+          </c-tabs>
+        </el-form>
+      </c-page>
+    </div>
+  </template>
+  
+  <script>
+  import Infsea from "./Infsea";
+  
+  export default {
+    name: "StaticsInfdia",
+    components: {
+      "m-infsea": Infsea,
+    },
+    provide() {
+      return {
+        root: this,
+      };
+    },
+    data() {
+      return {
+        tabVal: "infsea",
+        model: {
+          cod: "",
+          pageSize:5,
+          pageNum:1,
+          total:0
+  
+        },
+      };
+    },
+  };
+  </script>
+  
+  <style>
+  
+  </style>
+  
\ No newline at end of file

src/views/Statics/Inffee/Infsea.vue

@@ -113,12 +113,12 @@ export default {
       feeColumns: [
 				{ label: '费用代码', prop: 'cod', width: '120' },
         { label: '名称', prop: 'descrp', width: '120' },
-				{ label: '相关金额类型', prop: 'reltir', width: '150' },
-				{ label: 'SWIFT报文描述', prop: 'sftcod', width: '150' },
+				{ label: '计算费用相关的金额类型', prop: 'reltir', width: '190' },
+				{ label: 'SWIFT报文费用代码', prop: 'sftcod', width: '170' },
         { label: 'DTA报文中的费用代码', prop: 'dtacod', width: '170' },
 				{ label: '统计标志', prop: 'staflg', width: '120' },
-				{ label: '支付此费用的默认角色', prop: 'rol', width: '170' },
-        { label: '账号', prop: 'acc', width: '120' }
+				{ label: '默认付费角色', prop: 'rol', width: '170' },
+        { label: '费用账号', prop: 'acc', width: '120' }
 			],
     };
   },
@@ -161,7 +161,7 @@ export default {
         }
       }
       this.model.feelist = feeList;
-      console.log(this.model)
+      this.model.etgextkey = 'CEBGRP';
 			queryByPage(this.model).then(res => {
         /**
          * pageNumber: 0

src/views/Statics/Inftxm/Infsea.vue

@@ -2,22 +2,20 @@
   <div class="eibs-tab">
     <!-- 查询条件 -->
     <c-col :span="12" class="col-left">
-      <el-form-item label="实体组" prop="etgextkey" style="width:100%">
-        <c-select v-model="model.etgextkey" style="width:100%" placeholder="请选择实体组">
-          <el-option v-for="item in entyGrp" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
-        </c-select>
+      <el-form-item label="条款模板关键字" prop="extkey" style="width:100%">
+          <c-input v-model="model.extkey" placeholder="请输入条款模板关键字" style="width: 100%">
+        </c-input>
       </el-form-item>
     </c-col>
     <c-col :span="12" class="col-right">
-      <el-form-item label="名称" prop="nam">
-        <c-input v-model="model.nam" placeholder="请输入名称" style="width: 100%">
+      <el-form-item label="条款模板名称" prop="nam">
+        <c-input v-model="model.nam" placeholder="请输入条款模板名称" style="width: 100%">
         </c-input>
       </el-form-item>
     </c-col>
     <c-col :span="12" class="col-left">
-      <el-form-item label="语言" prop="uil" style="width:100%">
-        <c-select v-model="model.uil" style="width:100%" placeholder="请选择语言">
+      <el-form-item label="条款语种" prop="uil" style="width:100%">
+        <c-select v-model="model.uil" style="width:100%" placeholder="请选择条款语种">
           <el-option v-for="item in lang" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </c-select>
@@ -74,13 +72,13 @@ export default {
   inject: ["root"],
   data() {
     return {
-      entyGrp: [],
       lang: CodeTable['uiltxt'],
       txmData: [],
       txmColumns: [
-        { label: "名称", prop: "nam", width: "auto" },
-        { label: "语言", prop: "uil", width: "auto" },
-        { label: "内容", prop: "txt", width: "auto" },
+        { label: "条款模板关键字", prop: "extkey", width: "auto" },
+        { label: "条款模板名称", prop: "nam", width: "auto" },
+        { label: "条款模板内容", prop: "uil", width: "auto" },
+        { label: "版本号", prop: "ver", width: "auto" },
       ],
     };
   },
@@ -103,6 +101,7 @@ export default {
       return this.lang.filter(item => item.value === key)[0]?.label;
     },
     onInftxmSearch() {
+      this.model.etgextkey = 'CEBGRP';
       queryByPage(this.model).then((res) => {
         const list = res.list ?? [];
         list.map(item => item.uil = this.langValue(item.uil) ?? item.uil);

src/views/Statics/StaticsRouter.js

@@ -63,6 +63,12 @@ import Dbaatx from "./Dbaatx";
 import Dbeatx from "./Dbeatx";
 import Dbdatx from "./Dbdatx";
 
+import Infdia from "./Infdia";
+import Dbidia from "./Dbidia";
+import Dbadia from "./Dbadia";
+import Dbedia from "./Dbedia";
+import Dbddia from "./Dbddia";
+
 import Inftxm from "~/views/Statics/Inftxm";
 import Dbitxm from "~/views/Statics/Dbitxm";
 import Dbatxm from "~/views/Statics/Dbatxm";
@@ -75,6 +81,19 @@ import Dbafee from "./Dbafee";
 import Dbefee from "./Dbefee";
 import Dbdfee from "./Dbdfee";
 
+import Infcup from "./Infcup";
+import Dbicup from "./Dbicup";
+import Dbacup from "./Dbacup";
+import Dbecup from "./Dbecup";
+import Dbdcup from "./Dbdcup";
+
+import Dblapf from "./Dblapf";
+import Dbiapf from "./Dbiapf";
+import Dbaapf from "./Dbaapf";
+import Dbeapf from "./Dbeapf";
+import Dbdapf from "./Dbdapf";
+
+
 const StaticsRouter = [
     { path: 'infpty', component: Infpty, name: 'StaticsInfpty', meta: { title: '客户查询' } },
     { path: 'dbapty', component: Dbapty, name: 'StaticsDbapty', meta: { title: '客户新增' } },
@@ -141,6 +160,12 @@ const StaticsRouter = [
     { path: 'dbeatx/:inr', component: Dbeatx, name: 'StaticsDbeatx', meta: { title: (tag) => { return '保函文本修改: ' + tag.params.inr } } },
     { path: 'dbdatx/:inr', component: Dbdatx, name: 'StaticsDbdatx', meta: { title: (tag) => { return '保函文本删除: ' + tag.params.inr } } },
 
+    { path: 'infdia', component: Infdia, name: 'StaticsInfdia', meta: { title: '交易备忘录查询' } },
+    { path: 'dbadia', component: Dbadia, name: 'StaticsDbadia', meta: { title: '交易备忘录新增' } },
+    { path: 'dbidia/:inr', component: Dbidia, name: 'StaticsDbidia', meta: { title: (tag) => { return '交易备忘录详情: ' + tag.params.inr } } },
+    { path: 'dbedia/:inr', component: Dbedia, name: 'StaticsDbedia', meta: { title: (tag) => { return '交易备忘录修改: ' + tag.params.inr } } },
+    { path: 'dbddia/:inr', component: Dbddia, name: 'StaticsDbddia', meta: { title: (tag) => { return '交易备忘录删除: ' + tag.params.inr } } },
+
     { path: 'dbitxm/:inr', component: Dbitxm, name: 'StaticsDbitxm', meta: { title: (tag) => { return '固定格式文详情: ' + tag.params.inr } } },
     { path: 'dbatxm', component: Dbatxm, name: 'StaticsDbatxm', meta: { title: '固定格式文本新增' } },
     { path: 'dbetxm/:inr', component: Dbetxm, name: 'StaticsDbetxm', meta: { title: (tag) => { return '固定格式文修改: ' + tag.params.inr } } },
@@ -151,6 +176,18 @@ const StaticsRouter = [
     { path: 'dbifee/:inr', component: Dbifee, name: 'StaticsDbifee', meta: { title: (tag) => { return '费用代码详情: ' + tag.params.inr } } },
     { path: 'dbefee/:inr', component: Dbefee, name: 'StaticsDbefee', meta: { title: (tag) => { return '费用代码修改: ' + tag.params.inr } } },
     { path: 'dbdfee/:inr', component: Dbdfee, name: 'StaticsDbdfee', meta: { title: (tag) => { return '费用代码删除: ' + tag.params.inr } } },
+
+    { path: 'infcup', component: Infcup, name: 'StaticsInfcup', meta: { title: '查询申报币种信息' } },
+    { path: 'dbacup', component: Dbacup, name: 'StaticsDbacup', meta: { title: '新增申报币别信息' } },
+    { path: 'dbicup/:inr', component: Dbicup, name: 'StaticsDbicup', meta: { title: (tag) => { return '查看申报币种详情信息: ' + tag.params.inr } } },
+    { path: 'dbecup/:inr', component: Dbecup, name: 'StaticsDbecup', meta: { title: (tag) => { return '修改申报币别信息: ' + tag.params.inr } } },
+    { path: 'dbdcup/:inr', component: Dbdcup, name: 'StaticsDbdcup', meta: { title: (tag) => { return '删除申报币别信息: ' + tag.params.inr } } },
+
+    { path: 'dblapf', component: Dblapf, name: 'StaticsDblapf', meta: { title: '报文格式信息查询' } },
+    { path: 'dbaapf', component: Dbaapf, name: 'StaticsDbaapf', meta: { title: '报文格式信息新增' } },
+    { path: 'dbiapf/:inr', component: Dbiapf, name: 'StaticsDbiapf', meta: { title: (tag) => { return '报文格式信息详情: ' + tag.params.inr } } },
+    { path: 'dbeapf/:inr', component: Dbeapf, name: 'StaticsDbeapf', meta: { title: (tag) => { return '报文格式信息修改: ' + tag.params.inr } } },
+    { path: 'dbdapf/:inr', component: Dbdapf, name: 'StaticsDbdapf', meta: { title: (tag) => { return '报文格式信息删除: ' + tag.params.inr } } },
 ] 
 
 export default StaticsRouter