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

Development 202206

See merge request !5

src/main.js

@@ -15,6 +15,7 @@ import i18n from "./lang";
 import CustomComponent from "./components";
 import vuefunc from "./utils/vuefunc";
 import "./permission";
+import EventService,{LOGIN,LOGOUT} from "~/service/EventService";
 
 window.SUCCESS = "AAAAAA";
 
@@ -22,6 +23,20 @@ Vue.use(ElementUI, { size: "small", i18n: (key, value) => i18n.t(key, value) });
 Vue.use(CustomComponent);
 Vue.use(vuefunc);
 
+function resetCache(){
+  window.GLOBAL_CACHE = {PAGEID_CACHE:new Set()};
+}
+//初始化cache
+resetCache();
+//登录后重置
+EventService.on(LOGIN,()=>{
+  resetCache();
+});
+//退出后重置
+EventService.on(LOGOUT,()=>{
+  resetCache();
+});
+
 new Vue({
   el: "#app",
   store,

src/mixin/commonApi.js

@@ -90,9 +90,16 @@ export default {
         },
         async init(params) {
             const loading = this.loading("交易加载中")
-            let rtnmsg = await Api.post(this.requestPrefix + "/init", { params })
+            let prePageId = this.$route.params.prePageId || "";
+            console.log("init/prePageId:"+prePageId);
+            let data = { params,prePageId };
+     
+            let rtnmsg = await Api.post(this.requestPrefix + "/init", data)
             if (rtnmsg.respCode == SUCCESS) {
                 this.updateValueSet(rtnmsg.codeSet)
+                //添加pageId
+                if(rtnmsg.data.pageId)
+                   window.GLOBAL_CACHE.PAGEID_CACHE.add(rtnmsg.data.pageId);
             }
             loading.close()
             return rtnmsg
@@ -203,5 +210,11 @@ export default {
                 }
             });
         }
+    },
+    async beforeDestroy(){
+        if(!this.root && this.model && this.model.pageId){
+          //回收pageId
+          window.GLOBAL_CACHE.PAGEID_CACHE.delete(this.model.pageId);
+        }
     }
 }
\ No newline at end of file

src/service/Api.js

@@ -5,12 +5,26 @@ import RequestManager from './RequestManager.js';
 export const BASE_HOST = "/gjjs"
 export const BASE_URI=BASE_HOST+"";
 
-const instance = axios.create({
-    baseURL: BASE_URI,
-    timeout: 5000,
-    method: 'post',
+export const AxiosInstance = axios.create({
+    
   });
  
+//对全局的业务数据请求使用拦截器
+AxiosInstance.interceptors.request.use(function(config){
+  if(window.GLOBAL_CACHE && window.GLOBAL_CACHE.PAGEID_CACHE){
+    const key = "CUR-PAGE-IDS";
+    let pageIds = [...window.GLOBAL_CACHE.PAGEID_CACHE].join(","); 
+    if(!config.headers){
+      config.headers = {key:pageIds};
+    }else if(!config.headers[key]){
+      config.headers[key] = pageIds;
+    }
+  }
+  return config;
+},function(error){
+  return Promise.reject(error);
+})
+
 const CODE_KEY = "respCode"
 const MESSAGE_KEY = "respMsg"
 
@@ -26,7 +40,7 @@ export default class Api
         if(url!= `${BASE_URI}login` && token)
             headers.token = token;
         return new Promise( (resolve, reject) =>{
-            axios.get(url,data,{
+          AxiosInstance.get(url,data,{
                 headers,
                 
                 timeout: 50000,
@@ -74,8 +88,13 @@ export default class Api
         if (typeof data === "function") {
           data = await data()
         }
+        let curPid = data.pageId || "";
+        let prePid = data.prePageId || "";
+        //设置PAGEID
+        headers["CUR-PID"] = curPid;
+        headers["PRE-PID"] = prePid;
         return new Promise( (resolve, reject) =>{
-            axios.post(url,data,{
+          AxiosInstance.post(url,data,{
                 headers,
                 method,
                 timeout: 120000,
@@ -139,4 +158,8 @@ export default class Api
     {
       return this._get(BASE_HOST+url,data)
     }
+
+    static postAsync(url,data){
+      return this._post.call(url,data);
+    }
 }
\ No newline at end of file

src/service/EventService.js

+/**
+ * 自定义的事件触发器
+ */
+export default class EventService {
+    static on(key, fn){
+        if(!this.events[key]){
+            this.events[key] = [];
+        }
+        for(let originFn of this.events[key]){
+            if(originFn === fn){
+                return;
+            }
+        }
+        this.events[key].push(fn);
+        return ()=>{
+            this.off(key,fn);
+        }
+    }
+    static off(key,fn){
+        if(!this.events[key]){
+            return;
+        }
+        const fns = this.events[key];
+        for(let i=0;i<fns.length;i++){
+            if(fns[i] == fn){
+                fns.splice(i,1);
+                return;
+            }
+        }
+    }
+    static async emit(key,arg){
+        if(!this.events[key]){
+            return;
+        }
+        const results = [];
+        const fns = this.events[key];
+        for(let i = 0;i<fns.length;i++){
+            let result;
+            try{
+                result = await fns[i](arg);
+            }catch(error){
+
+            }
+            results.push(result);
+        }
+        return results;
+    }
+}
+EventService.events = {}
+
+const LOGIN="LOGIN"
+const LOGOUT="LOGOUT"
+export {LOGIN,LOGOUT}
\ No newline at end of file

src/service/test/atp.js

+import Api from "~/service/Api"
+
+export function queryByPage(data) {
+    return Api.post("/test/atp/queryByPage", data)
+}
+
+export function queryById(inr) {
+    return Api.post(`/test/atp/queryById?inr=${inr}`)
+}
+
+export function add(data) {
+    return Api.post("/test/atp/add", data)
+}
+
+export function edit(data) {
+    return Api.post("/test/atp/edit", data)
+}
+
+export function deleteById(inr) {
+    return Api.post(`/test/atp/deleteById?inr=${inr}`)
+}
\ No newline at end of file

src/service/test/usr.js

@@ -20,25 +20,25 @@ export function deleteById(inr) {
     return Api.post(`/test/usr/deleteById?inr=${inr}`)
 }
 
-export function addUbrData(inr, data) {
-    return Api.post(`/test/usr/addUbrData?inr=${inr}`, data)
+export function addUbrData(data) {
+    return Api.post(`/test/usr/addUbrData`, data)
 }
 
-export function updateUbrData(inr, data) {
-    return Api.post(`/test/usr/updateUbrData?inr=${inr}`, data)
+export function updateUbrData(data) {
+    return Api.post(`/test/usr/updateUbrData`, data)
 }
 
-export function deleteUbrData(data) {
-    return Api.post(`/test/usr/deleteUbrData`, data)
+export function deleteUbrData(inr) {
+    return Api.post(`/test/usr/deleteUbrData?inr=${inr}`, inr)
 }
-export function addUclData(inr, data) {
-    return Api.post(`/test/usr/addUclData?inr=${inr}`, data)
+export function addUclData(data) {
+    return Api.post(`/test/usr/addUclData`, data)
 }
 
-export function updateUclData(inr, data) {
-    return Api.post(`/test/usr/updateUclData?inr=${inr}`, data)
+export function updateUclData(data) {
+    return Api.post(`/test/usr/updateUclData`, data)
 }
 
-export function deleteUclData(data) {
-    return Api.post(`/test/usr/deleteUclData`, data)
+export function deleteUclData(usr, branchinr) {
+    return Api.post(`/test/usr/deleteUclData?usr=${usr}&&branchinr=${branchinr}`, usr, branchinr)
 }
\ No newline at end of file

src/views/Business/Cptadv/Basp.vue

@@ -304,7 +304,7 @@
 import Api from "~/service/Api"
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Brtset/Event"
+import Event from "~/model/Cptadv/Event"
 
 export default {
     inject: ['root'],
@@ -319,7 +319,7 @@ export default {
     created: function () {
         this.executeRule("bopmod.dbdp.basp").then((res) => {
             if (res.respCode == SUCCESS) {
-                this.copyValueFromVO(res.data);
+                this.updateModel(res.data);
             }
         });
     }

src/views/Business/Cptadv/Basp3.vue

@@ -322,7 +322,7 @@
 import Api from "~/service/Api"
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Brtset/Event"
+import Event from "~/model/Cptadv/Event"
 
 export default {
     inject: ['root'],
@@ -337,7 +337,7 @@ export default {
     created: function () {
         this.executeRule("bopmod.dbap.basp").then((res) => {
             if (res.respCode == SUCCESS) {
-                this.copyValueFromVO(res.data);
+                this.updateModel(res.data);
             }
         });
     }

src/views/Business/Cptadv/Cips.vue

@@ -902,7 +902,13 @@ export default {
     
   },
   methods: { ...Event },
-    created: function () {},
+    created: function () {
+      this.executeRule("trnmod.cipmod.cips").then((res) => {
+            if (res.respCode == SUCCESS) {
+                this.updateModel(res.data);
+            }
+        });
+    },
 };
 </script>
 <style>

src/views/Business/Cptadv/Cips2.vue

@@ -293,7 +293,11 @@ export default {
     },
     methods:{...Event},
     created:function(){
-
+        this.executeRule("trnmod.cipmod.cips3").then((res) => {
+            if (res.respCode == SUCCESS) {
+                this.updateModel(res.data);
+            }
+        });
     }
 }
 </script>

src/views/Business/Cptadv/Cnyp.vue

@@ -27,7 +27,7 @@
 import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
-import Event from "~/model/Cptopn/Event";
+import Event from "~/model/Cptadv/Event";
 
 
 import Cnyp1 from "./Cnyp1";

src/views/Business/Cptadv/CptAdvChangePanel.vue

@@ -148,7 +148,7 @@
             v-model="model.cpdgrp.orc.pts.adrblk"
             show-word-limit
             placeholder="请输入地址信息"
-            :disabled="model.cpdgrp.rec.swftyp == ''"
+            disabled
           ></c-input>
         </el-form-item>
       </c-col>

src/views/Business/Cptadv/Incp.vue

@@ -356,7 +356,13 @@ export default {
     return {};
   },
   methods: { ...Event },
-  created: function () {},
+  created: function () {
+    this.executeRule("cnybop.incp").then((res) => {
+      if (res.respCode == SUCCESS) {
+        this.updateModel(res.data);
+      }
+    });
+  },
 };
 </script>
 <style>

src/views/Business/Cptadv/P112cov.vue

@@ -381,7 +381,13 @@ export default {
     return {};
   },
   methods: { ...Event },
-  created: function () {},
+  created: function () {
+    this.executeRule("trnmod.cipmod.cips").then((res) => {
+        if (res.respCode == SUCCESS) {
+            this.updateModel(res.data);
+        }
+    });
+  },
 };
 </script>
 <style>

src/views/Business/Cptadv/Wg.vue

@@ -75,7 +75,7 @@
         </c-col>
         
         <c-col :span="11">
-          <el-form-item label="" label-width="5px">
+          <el-form-item label="" label-width="5px" prop="bopmod.outchargeamt">
             <c-input-currency v-model="model.bopmod.outchargeamt"  
               style="text-align: right;" 
               placeholder="请输入国外银行扣费（涉外收入申报专用）" 
@@ -153,7 +153,11 @@ export default {
           }
     },
     created:function(){
-
+      this.executeRule("bopmod.wg").then((res) => {
+            if (res.respCode == SUCCESS) {
+                this.updateModel(res.data);
+            }
+        });
     }
 }
 </script>

src/views/Business/Ditopn/index.vue

@@ -13,6 +13,10 @@
       </c-function-btn>
       <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small"
         :validate-on-rule-change="false">
+        <el-form-item label="test">
+          <c-mul-row-input v-model="testVal" v-on:input="onInput" :rows="3" :cols="5" :charmod="0"></c-mul-row-input>
+          <pre>{{testVal}}</pre>
+        </el-form-item>
         <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick">
           <el-tab-pane label="基本信息" name="ovwp">
             <!--PD000001 -->
@@ -167,6 +171,7 @@ export default {
   data() {
     return {
       tabVal: "ovwp",
+      testVal: "",
       trnName: "ditopn",
       model: new Ditopn().data,
       customModel: new customDitopn().data,
@@ -184,6 +189,9 @@ export default {
     };
   },
   methods: {
+    onInput(val){
+      console.log(val)
+    }
   },
   created: async function () {
     console.log("进入ditopn交易");

src/views/Layout/Header.vue

@@ -222,6 +222,7 @@
 <script>
 import cPage from "../../components/c-page.vue";
 import Api from "~/service/Api";
+import EventService, {LOGOUT} from "~/service/EventService";
 import { changeLang } from "~/service/business/lang";
 
 export default {
@@ -281,6 +282,7 @@ export default {
   },
   methods: {
     logout() {
+      EventService.emit(LOGOUT);
       this.$store.commit("UserContext/setLogout");
       this.$router.push("/login");
       // window.location.href = "/#/login"

src/views/Login/index.vue

@@ -65,6 +65,8 @@
 import Utils from "~/utils";
 import { createNamespacedHelpers } from "vuex";
 import axios from "axios";
+import EventService, {LOGIN} from "~/service/EventService";
+
 
 const { mapState, mapMutations, mapActions } =
   createNamespacedHelpers("UserContext");
@@ -96,6 +98,7 @@ export default {
             userId: this.loginForm.username,
             token: Utils.generateUUID(),
           });
+          EventService.emit(LOGIN)
           // 电证登录
           const dzUsr = usrMap[this.loginForm.username === "ZL" ? "ZL" : "MBF"];
           const headers = {

src/views/Statics/Dbaatp/index.vue

+<template>
+	<m-atp ref="atp" title="dbaatp" type="add"></m-atp>
+</template>
+
+<script>
+import Dbiatp from "~/views/Statics/Dbiatp";
+
+export default {
+  name: "StaticsDbaatp",
+	components: {
+		"m-atp": Dbiatp
+	},
+  data() {
+    return {};
+  },
+  mounted() {
+    this.$refs.fec.rules['fecList'] = [
+      { type: 'array', required: true, min: 1, message: '地址信息栏不能为空' }
+    ]
+  }
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbdatp/index.vue

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

src/views/Statics/Dbeatp/index.vue

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

src/views/Statics/Dbiatp/Atp.js

+export default class Pty {
+	constructor() {
+		this.data = {
+			inr: "",
+			cod: "",
+			rouflg: "",
+			bus: "",
+			concreflg: "",
+			dtaflg: "",
+			sepflg: "",
+			jobflg: "",
+			subflg: "",
+			lnkobj: "",
+			ccstyp: "",
+			ver: "",
+			bustrnflg: "",
+			relamt: "",
+			reltyp: "",
+			negflg: "",
+			dealtim: "",
+		}
+	}
+}
+
+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" }
+	],
+	"rouflg": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+	],
+	"bus": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 2, "message": "最大长度2个字符", "trigger": "blur" }
+	],
+	"concreflg": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+	],
+	"dtaflg": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+	],
+	"sepflg": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+	],
+	"jobflg": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+	],
+	"subflg": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+	],
+	"lnkobj": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
+	],
+	"ccstyp": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" }
+	],
+	"ver": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 4, "message": "最大长度4个字符", "trigger": "blur" }
+	],
+	"bustrnflg": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+	],
+	"relamt": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+	],
+	"reltyp": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+	],
+	"negflg": [
+		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
+		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+	],
+	"dealtim": [
+	],
+}
+
+

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-input
+                v-model="model.cod"
+                placeholder="请输入代码"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <el-form-item label="控制标志" prop="rouflg">
+            <c-input
+                v-model="model.rouflg"
+                placeholder="请输入rouflg"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <el-form-item label="业务品种" prop="bus">
+            <c-input
+                v-model="model.bus"
+                placeholder="请输入bus"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <el-form-item label="创建新进程标志" prop="concreflg">
+            <c-input
+                v-model="model.concreflg"
+                placeholder="请输入concreflg"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <el-form-item label="处理数据标志" prop="dtaflg">
+            <c-input
+                v-model="model.dtaflg"
+                placeholder="请输入dtaflg"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <el-form-item label="处理临时结算标志" prop="sepflg">
+            <c-input
+                v-model="model.sepflg"
+                placeholder="请输入sepflg"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <el-form-item label="后台进程标志" prop="jobflg">
+            <c-input
+                v-model="model.jobflg"
+                placeholder="请输入jobflg"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <el-form-item label="创建子合同进程" prop="subflg">
+            <c-input
+                v-model="model.subflg"
+                placeholder="请输入subflg"
+            >
+            </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="lnkobj">
+            <c-input
+                v-model="model.lnkobj"
+                placeholder="请输入lnkobj"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <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"
+            >
+            </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"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <el-form-item label="用于release的金额" prop="relamt">
+            <c-input
+                v-model="model.relamt"
+                placeholder="请输入relamt"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <el-form-item label="release规则类型" prop="reltyp">
+            <c-input
+                v-model="model.reltyp"
+                placeholder="请输入reltyp"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <el-form-item label="押汇中心处理标志" prop="negflg">
+            <c-input
+                v-model="model.negflg"
+                placeholder="请输入negflg"
+            >
+            </c-input>
+        </el-form-item>
+    </c-col>
+	<c-col :span="24">
+        <el-form-item label="交易处理时间" prop="dealtim">
+            <c-input
+                v-model="model.dealtim"
+                placeholder="请输入dealtim"
+            >
+            </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/Dbiatp/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="atp">
+            <c-content>
+              <m-atp-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 Atp, { Pattern } from "./Atp.js";
+
+import AtpInfo from "./AtpInfo.vue";
+
+import { queryById, add, edit, deleteById } from "~/service/test/atp.js";
+
+export default {
+  name: "StaticsDbiatp",
+  components: {
+    "m-atp-info": AtpInfo,
+  },
+  provide() {
+    return {
+      root: this,
+    };
+  },
+  props: {
+		type: {
+			type: String,
+			default: "info"
+		},
+		title: {
+			type: String,
+			default: "dbiatp"
+		}
+	},
+  data() {
+    return {
+      model: new Atp().data,
+      tabVal: "atp",
+      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()
+            })
+            .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 是否更新infatp的查询列表
+     */
+    goBack(update) {
+      this.$store.dispatch("TagsView/delView", this.$route);
+      this.$router.push({ name: "StaticsInfatp", params: { update } });
+    },
+
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbicty/BopctyInfo.vue

 <template>
     <div class="eibs-tab">
 <c-col :span="12" class="col-left">
-	<c-col :span="24">
-        <el-form-item label="inrBopcty" prop="inrBopcty">
+	<!-- <c-col :span="24">
+        <el-form-item label="ID" prop="inrBopcty">
             <c-input
                 v-model="model.inrBopcty"
-                placeholder="请输入inrBopcty"
+                placeholder="请输入ID"
             >
             </c-input>
         </el-form-item>
-    </c-col>
+    </c-col> -->
 	<c-col :span="24">
-        <el-form-item label="codBopcty" prop="codBopcty">
+        <el-form-item label="国家编号" prop="codBopcty">
             <c-input
                 v-model="model.codBopcty"
-                placeholder="请输入codBopcty"
+                placeholder="请输入国家编号"
             >
             </c-input>
         </el-form-item>
     </c-col>
 	<c-col :span="24">
-        <el-form-item label="numcodBopcty" prop="numcodBopcty">
+        <el-form-item label="Numcod" prop="numcodBopcty">
             <c-input
                 v-model="model.numcodBopcty"
-                placeholder="请输入numcodBopcty"
+                placeholder="请输入Numcod"
             >
             </c-input>
         </el-form-item>
@@ -31,32 +31,32 @@
 </c-col>
 <c-col :span="12" class="col-right">
 	<c-col :span="24">
-        <el-form-item label="txtBopcty" prop="txtBopcty">
+        <el-form-item label="国家简称" prop="txtBopcty">
             <c-input
                 v-model="model.txtBopcty"
-                placeholder="请输入txtBopcty"
+                placeholder="请输入国家简称"
             >
             </c-input>
         </el-form-item>
     </c-col>
 	<c-col :span="24">
-        <el-form-item label="fultxtBopcty" prop="fultxtBopcty">
+        <el-form-item label="国家全称" prop="fultxtBopcty">
             <c-input
                 v-model="model.fultxtBopcty"
-                placeholder="请输入fultxtBopcty"
+                placeholder="请输入国家全称"
             >
             </c-input>
         </el-form-item>
     </c-col>
-	<c-col :span="24">
-        <el-form-item label="verBopcty" prop="verBopcty">
+	<!-- <c-col :span="24">
+        <el-form-item label="Version" prop="verBopcty">
             <c-input
                 v-model="model.verBopcty"
-                placeholder="请输入verBopcty"
+                placeholder="请输入Version"
             >
             </c-input>
         </el-form-item>
-    </c-col>
+    </c-col> -->
 </c-col>
  </div>
 </template>

src/views/Statics/Dbicty/CtyInfo.vue

 <template>
   <div class="eibs-tab">
 <c-col :span="12" class="col-left">
-	<c-col :span="24">
-        <el-form-item label="inr" prop="inr">
+	<!-- <c-col :span="24">
+        <el-form-item label="内部唯一ID号" prop="inr">
             <c-input
                 v-model="model.inr"
-                placeholder="请输入inr"
+                placeholder="请输入内部唯一ID号"
             >
             </c-input>
         </el-form-item>
-    </c-col>
+    </c-col> -->
 	<c-col :span="24">
-        <el-form-item label="cod" prop="cod">
+        <el-form-item label="国家代码" prop="cod">
             <c-input
                 v-model="model.cod"
-                placeholder="请输入cod"
+                placeholder="请输入国家代码"
             >
             </c-input>
         </el-form-item>
     </c-col>
 	<c-col :span="24">
-        <el-form-item label="cur" prop="cur">
+        <el-form-item label="币种" prop="cur">
             <c-input
                 v-model="model.cur"
-                placeholder="请输入cur"
+                placeholder="请输入币种"
             >
             </c-input>
         </el-form-item>
     </c-col>
 	<c-col :span="24">
-        <el-form-item label="reg" prop="reg">
+        <el-form-item label="区域" prop="reg">
             <c-input
                 v-model="model.reg"
-                placeholder="请输入reg"
+                placeholder="请输入区域"
             >
             </c-input>
         </el-form-item>
     </c-col>
-	<c-col :span="24">
-        <el-form-item label="ver" prop="ver">
+	<!-- <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> -->
 </c-col>
 <c-col :span="12" class="col-right">
 	<c-col :span="24">
-        <el-form-item label="fmtdomadrtyp" prop="fmtdomadrtyp">
+        <el-form-item label="本国地址" prop="fmtdomadrtyp">
             <c-input
                 v-model="model.fmtdomadrtyp"
-                placeholder="请输入fmtdomadrtyp"
+                placeholder="请输入本国地址"
             >
             </c-input>
         </el-form-item>
     </c-col>
 	<c-col :span="24">
-        <el-form-item label="fmtintadrtyp" prop="fmtintadrtyp">
+        <el-form-item label="国际地址" prop="fmtintadrtyp">
             <c-input
                 v-model="model.fmtintadrtyp"
-                placeholder="请输入fmtintadrtyp"
+                placeholder="请输入国际地址"
             >
             </c-input>
         </el-form-item>

src/views/Statics/Dbicty/index.vue

@@ -11,15 +11,15 @@
         :validate-on-rule-change="false"
         :disabled="isDisabled"
       >
-        <c-tabs v-model="tabVal" ref="elment" type="card">
-          <el-tab-pane label="基本信息" name="cty">
+        <c-tabs v-model="tabVal" ref="elment" type="card"  @tab-click="changePosition">
+          <el-tab-pane label="国家地区信息" name="cty">
             <c-content>
               <m-cty-info :model="model" />
             </c-content>
           </el-tab-pane>
-          <el-tab-pane label="???" name="bopcty">
+          <el-tab-pane label="收支申报国家代码表" name="bopcty">
             <c-content>
-              <m-bopcty-list :model="model" />
+              <m-bopcty-info :model="model" />
             </c-content>
           </el-tab-pane>
         </c-tabs>
@@ -59,13 +59,13 @@ import Cty, { Pattern } from "./Cty.js";
 import CtyInfo from "./CtyInfo.vue";
 import BopctyInfo from "./BopctyInfo.vue";
 
-import { queryById, add, edit, deleteById } from "~/service/test/cty.js";
+import { queryById, add, edit, deleteById, editBopctyData, deleteBopctyById} from "~/service/test/cty.js";
 
 export default {
   name: "StaticsDbicty",
   components: {
     "m-cty-info":CtyInfo,
-    "m-bopcty-list":BopctyInfo,
+    "m-bopcty-info":BopctyInfo,
   },
   provide() {
     return {
@@ -87,6 +87,7 @@ export default {
       model: new Cty().data,
       tabVal: "cty",
       rules: Pattern,
+      tabPosition:"tab-cty",
     };
   },
   computed: {
@@ -101,7 +102,7 @@ export default {
         if (res.inr) {
           this.model = res;
         } else {
-          this.$message.error("国家代码不存在")
+          this.$message.error("国家地区信息不存在")
         }
       });
     }
@@ -126,14 +127,24 @@ export default {
     commitEdit() {
       this.$refs.modelForm.validate((validated) => {
         if (validated) {
+          if(this.tabPosition===`tab-cty`){
           edit(this.model)
             .then((res) => {
-              this.$message.success("保存成功！");
+              this.$message.success("国家地区信息保存成功！");
               this.goBack()
             })
             .catch((err) => {
-              this.$message.error("保存失败！");
+              this.$message.error("国家地区信息保存失败！");
+            });}else{
+              editBopctyData(this.model.inr,this.model)
+            .then((res) => {
+              this.$message.success("收支申报国家代码表保存成功！");
+              this.goBack()
+            })
+            .catch((err) => {
+              this.$message.error("收支申报国家代码表保存失败！");
             });
+            }
         } else {
           Utils.formValidateTips(this.$refs.modelForm.fields)
         }
@@ -146,14 +157,24 @@ export default {
         type: "warning",
       })
         .then(() => {
+          if(this.tabPosition===`tab-cty`){
           deleteById(this.model.inr)
             .then((res) => {
-              this.$message.success("删除成功！");
+              this.$message.success("国家地区信息删除成功！");
               this.goBack(true)
             })
             .catch((err) => {
-              this.$message.error("删除失败！");
-            });
+              this.$message.error("国家地区信息删除失败！");
+            })}else{
+              deleteBopctyById(this.model)
+            .then((res) => {
+              this.$message.success("收支申报国家代码表删除成功！");
+              this.goBack(true)
+            })
+            .catch((err) => {
+              this.$message.error("收支申报国家代码表删除失败！");
+            })
+            };
         })
         .catch(() => {
           this.$message({
@@ -169,6 +190,10 @@ export default {
       this.$store.dispatch("TagsView/delView", this.$route);
       this.$router.push({ name: "StaticsInfcty", params: { update } });
     },
+    changePosition(tab,event){
+      this.tabPosition=event.target.getAttribute('id');
+      console.log(this.tabPosition)
+    },
 
   },
 };

src/views/Statics/Dbifec/Fec.js

@@ -104,14 +104,6 @@ export default class Pty {
 }
 
 export const Pattern = {
-	"inr": [
-		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
-		{ "max": 8, "message": "最大长度8个字符", "trigger": "blur" }
-	],
-	"feeinr": [
-		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
-		{ "max": 8, "message": "最大长度8个字符", "trigger": "blur" }
-	],
 	"feepri": [
 		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
 		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
@@ -322,10 +314,6 @@ export const Pattern = {
 		{ "required": true, "message": "必输项", "trigger": "blur" },
 		{ "pattern": /^-?\d{0,14}(\.\d{1,6})?$/, "message": "整数不能超过14位，小数不能超过6位", "trigger": "blur" }
 	],
-	"ver": [
-		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
-		{ "max": 4, "message": "最大长度4个字符", "trigger": "blur" }
-	],
 	"colltr": [
 		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
 		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
@@ -406,10 +394,6 @@ export const Pattern = {
 		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
 		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
 	],
-	"inrFee": [
-		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
-		{ "max": 8, "message": "最大长度8个字符", "trigger": "blur" }
-	],
 	"codFee": [
 		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
 		{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
@@ -454,10 +438,6 @@ export const Pattern = {
 		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
 		{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
 	],
-	"verFee": [
-		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
-		{ "max": 4, "message": "最大长度4个字符", "trigger": "blur" }
-	],
 	"dscmodflgFee": [
 		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
 		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }

src/views/Statics/Dbifec/FecInfo.vue

@@ -2,24 +2,6 @@
   <div class="eibs-tab">
     <c-col :span="12" class="col-left">
       <c-col :span="24">
-            <el-form-item label="费用代码唯一索引ID" prop="inr">
-                <c-input
-                    v-model="model.inr"
-                    placeholder="请输入费用代码唯一索引ID"
-                >
-                </c-input>
-            </el-form-item>
-        </c-col>
-      <c-col :span="24">
-            <el-form-item label="相关费用的唯一索引ID" prop="feeinr">
-                <c-input
-                    v-model="model.feeinr"
-                    placeholder="请输入相关费用的唯一索引ID"
-                >
-                </c-input>
-            </el-form-item>
-        </c-col>
-      <c-col :span="24">
             <el-form-item label="收费条件类型" prop="feepri">
                 <c-input
                     v-model="model.feepri"
@@ -343,8 +325,6 @@
                 </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="perrattr4">
                 <c-input
@@ -354,6 +334,8 @@
                 </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="permintr4">
                 <c-input-currency
@@ -499,15 +481,6 @@
             </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="colltr">
                 <c-input
                     v-model="model.colltr"

src/views/Statics/Dbifec/FeeInfo.vue

@@ -2,15 +2,6 @@
   <div class="eibs-tab">
     <c-col :span="12" class="col-left">
     <c-col :span="24">
-          <el-form-item label="唯一索引ID" prop="inrFee">
-              <c-input
-                  v-model="model.inrFee"
-                  placeholder="请输入唯一索引ID"
-              >
-              </c-input>
-          </el-form-item>
-      </c-col>
-    <c-col :span="24">
           <el-form-item label="费用代码" prop="codFee">
               <c-input
                   v-model="model.codFee"
@@ -112,15 +103,6 @@
           </el-form-item>
       </c-col>
     <c-col :span="24">
-          <el-form-item label="版本号" prop="verFee">
-              <c-input
-                  v-model="model.verFee"
-                  placeholder="请输入版本号"
-              >
-              </c-input>
-          </el-form-item>
-      </c-col>
-    <c-col :span="24">
           <el-form-item label="费用描述是否允许修改" prop="dscmodflgFee">
               <c-input
                   v-model="model.dscmodflgFee"

src/views/Statics/Dbiusr/UbrInfo.vue

@@ -104,7 +104,7 @@
           </el-form-item>
         </c-col>
         <c-col :span="24">
-          <el-form-item label="autamt" prop="autamt">
+          <el-form-item label="一次性释放授权" prop="autamt">
             <c-input
                 v-model="ubr.autamt"
                 placeholder="请输入一次性释放授权"
@@ -130,3 +130,6 @@ export default {
   },
 };
 </script>
+
+<style>
+</style>

src/views/Statics/Dbiusr/UbrList.vue

 <template>
   <div class="eibs-tab">
     <div style="text-align: right">
-      <c-button size="small" type="primary" @click="ubrAdd()"> 新增 </c-button>
+      <c-button size="small" type="primary" @click="ubrAdd()" :disabled="false"> 新增 </c-button>
     </div>
     <el-form-item label="" label-width="0" prop="ubrList">
       <c-table :columnsConfig="columns" :list="model.ubrList">
@@ -149,7 +149,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then((res) => {
-        deleteUbrData(row).then((res) => {
+        deleteUbrData(row.inr).then((res) => {
           if (res) {
             this.model.ubrList.splice(index, 1);
             this.$message.success("删除成功！");
@@ -165,11 +165,11 @@ export default {
     editUbr() {
       this.$refs.ubr.$refs.modelForm.validate((validated) => {
         if (validated) {
-          updateUbrData(this.model.inr, this.ubr)
+          updateUbrData(this.ubr)
               .then((res) => {
-                if (res.ubr) {
+                if (res) {
                   this.$message.success("修改柜员权限信息成功！");
-                  this.model.ubrList = res.ubrList;
+                  // this.model.ubrList = res.ubrList;
                   this.handleClose();
                 }
               })
@@ -195,16 +195,17 @@ export default {
       } else {
         this.$refs.ubr.$refs.modelForm.validate((validated) => {
           if (validated) {
-            addUbrData(this.model.inr, this.ubr)
+            // this.ubr.inr = this.model.inr
+                addUbrData(this.ubr)
                 .then((res) => {
-                  if (res && res.inr) {
-                    this.$message.success("保存地址信息成功！");
+                  if (res) {
+                    this.$message.success("保存柜员权限信息成功！");
                     this.model.ubrList = res.ubrList;
                     this.handleClose();
                   }
                 })
                 .catch((error) => {
-                  this.$message.error("保存地址信息失败！");
+                  this.$message.error("保存柜员权限信息失败！");
                 });
           }
         });

src/views/Statics/Dbiusr/UclInfo.vue

@@ -86,3 +86,6 @@ export default {
   }
 }
 </script>
+
+<style>
+</style>
\ No newline at end of file

src/views/Statics/Dbiusr/UclList.vue

@@ -83,7 +83,6 @@ import {
   updateUclData,
   deleteUclData,
 } from "@/service/test/usr";
-import {addAdrData, deleteAdrData, updateAdrData} from "@/service/test/pty";
 
 export default {
   name: "UclList",
@@ -124,7 +123,6 @@ export default {
     uclAdd() {
       this.ucl = new Ucl().data;
       this.operate = "add";
-      this.operateIdx = index;
       this.uclDialog = true;
     },
     /**
@@ -145,7 +143,8 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then((res) => {
-        deleteUclData(row).then((res) => {
+        console.log(row.branchinr)
+        deleteUclData(row.usr, row.branchinr).then((res) => {
           if (res) {
             this.model.uclList.splice(index, 1);
             this.$message.success("删除成功！");
@@ -161,11 +160,10 @@ export default {
     editUcl() {
       this.$refs.ucl.$refs.modelForm.validate((validated) => {
         if (validated) {
-          updateAdrData(this.model.inr, this.ucl)
+          updateUclData(this.ucl)
               .then((res) => {
-                if (res.inr) {
+                if (res.usr) {
                   this.$message.success("修改柜员组信息成功！");
-                  this.model.uclList = res.uclList;
                   this.handleClose();
                 }
               })
@@ -191,16 +189,15 @@ export default {
       } else {
         this.$refs.ucl.$refs.modelForm.validate((validated) => {
           if (validated) {
-            addUclData(this.model.inr, this.ucl)
+            addUclData(this.ucl)
                 .then((res) => {
-                  if (res && res.inr) {
-                    this.$message.success("保存地址信息成功！");
-                    this.model.uclList = res.uclList;
+                  if (res) {
+                    this.$message.success("保存柜员组信息成功！");
                     this.handleClose();
                   }
                 })
                 .catch((error) => {
-                  this.$message.error("保存地址信息失败！");
+                  this.$message.error("保存柜员组信息失败！");
                 });
           }
         });

src/views/Statics/Dbiusr/UsrInfo.vue

@@ -55,15 +55,15 @@
           </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 :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 :span="24">
         <el-form-item label="实体标志" prop="pri">
           <c-input

src/views/Statics/Infatp/Infsea.vue

+<template>
+  <div class="eibs-tab">
+  
+   <c-col :span="12" class="col-left">
+      <c-col :span="24">
+        <el-form-item label="交易配置信息代码" prop="cod">
+          <c-input v-model="model.cod" placeholder="请输入交易配置信息代码" 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="代码描述" prop="cod">
+          <c-input v-model="model.cod" placeholder="请输入代码描述" 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="atpAdd">新增</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="onInfatpSearch()"
+          >查询
+        </el-button>
+      </c-col>
+    </c-col>
+    <c-col :span="24">
+      <c-paging-table 
+        :data="atpData"
+        :columns="atpColumns"
+        :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="atpInfo(scope.$index, scope.row)"
+              >详情</c-button
+            >
+            <c-button
+              style="margin-left: 5px"
+              size="small"
+              type="primary"
+              @click="atpEdit(scope.$index, scope.row)"
+              >修改</c-button
+            >
+            <c-button
+              size="small"
+              style="margin-left: 5px"
+              @click="atpDelete(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/atp.js";
+
+export default {
+  name: "",
+  props: ["model"],
+  inject: ["root"],
+  data() {
+    return {
+      atpData: [],
+      atpColumns: [
+				{ label: '交易配置信息代码', prop: 'cod', width: '240' },
+				{ label: '描述', prop: 'cod', width: '600' },
+				
+			],
+    };
+  },
+  computed: {
+  },
+  activated() {
+    const { update } = this.$route.params
+    if (update) {
+      this.onInfatpSearch()
+    }
+  },
+  methods: {
+    handleReset() {
+      this.root.$refs.modelForm.resetFields();
+    },
+    onInfatpSearch() {
+			queryByPage(this.model).then(res => {
+        /**
+         * pageNumber: 0
+         * pageSize:	0
+         * total: 69
+         * totalPage: 0
+         */
+        const list = res.list
+        this.atpData = 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.onInfatpSearch()
+    },
+    atptypeChange(val) {
+      this.model.fectyp = val;
+    },
+    atpCodesByKey(key) {
+      return codes[key] ?? [];
+    },
+    atpAdd() {
+			this.$router.push(`/statics/dbaatp`)
+		},
+    atpInfo(index, row) {
+			this.$router.push(`/statics/dbiatp/${row.inr}`)
+		},
+    atpEdit(index, row) {
+			this.$router.push(`/statics/dbeatp/${row.inr}`)
+		},
+    atpDelete(index, row) {
+			this.$router.push(`/statics/dbdatp/${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>

src/views/Statics/Infatp/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>
+          <!-- <el-tab-pane label="交易配置信息" name="curpo">
+            <c-content>
+              <m-curpo :model="model" ref="curpo" />
+            </c-content>
+          </el-tab-pane> -->
+        </c-tabs>
+      </el-form>
+    </c-page>
+  </div>
+</template>
+
+<script>
+import Infsea from "./Infsea";
+
+export default {
+  name: "StaticsInfatp",
+  components: {
+    "m-infsea": Infsea,
+  },
+  provide() {
+    return {
+      root: this,
+    };
+  },
+  data() {
+    return {
+      tabVal: "infsea",
+      model: {
+        cod: "",
+        pageSize:5,
+        pageNum:1,
+        total:0
+
+      },
+    };
+  },
+};
+</script>
+
+<style>
+
+</style>

src/views/Statics/Infcty/Infsea.vue

@@ -3,7 +3,7 @@
 <!-- ----------左 ---------->
     <c-col :span="12" class="col-left">
       <c-col :span="24">
-        <el-form-item label="Country or region Code" prop="cod">
+        <el-form-item label="国家代码" prop="cod">
             <c-input  v-model="model.cod"  placeholder=""></c-input>
         </el-form-item>
        </c-col>
@@ -12,8 +12,8 @@
  <!------------- 右 ---------->
  <c-col :span="12" class="col-right">
        <c-col :span="24">
-        <el-form-item label="Name" prop="nam">
-            <c-input  v-model="model.nam"  placeholder=""></c-input>
+        <el-form-item label="国家简称" prop="txtBopcty">
+            <c-input  v-model="model.txtBopcty"  placeholder=""></c-input>
         </el-form-item>
        </c-col>
        </c-col>
@@ -96,17 +96,17 @@ import codes from "~/config/CodeTable";
 import { queryByPage } from "~/service/test/cty.js";
 
 export default {
-  name: "infsea",
+  name: "",
   props: ["model"],
   inject: ["root"],
   data() {
     return {
       ctyData: [],
       ctyColumns: [
-				{ label: 'Country or region', prop: '', width: 'auto' },
-				{ label: 'Description', prop: '', width: 'auto' },
-				{ label: 'Currency', prop: '', width: 'auto' },
-				{ label: 'Region', prop: '', width: 'auto' },
+				{ label: '国家代码', prop: 'cod', width: 'auto' },
+				{ label: '国家简称', prop: 'txtBopcty', width: 'auto' },
+				{ label: '币种', prop: 'cur', width: 'auto' },
+				{ label: '区域', prop: 'reg', width: 'auto' },
 			],
     };
   },

src/views/Statics/Infcty/index.vue

@@ -38,7 +38,12 @@ export default {
     return {
       tabVal: "infsea",
       model: {
-        
+        txtBopcty: "",
+        cod: "",
+        // paging
+        pageNum: 1,
+        pageSize: 5,
+        total: 0
       },
     };
   },

src/views/Statics/StaticsRouter.js

@@ -44,6 +44,12 @@ import Dbabch from "./Dbabch";
 import Dbebch from "./Dbebch";
 import Dbdbch from "./Dbdbch";
 
+import Infatp from "./Infatp";
+import Dbiatp from "./Dbiatp";
+import Dbaatp from "./Dbaatp";
+import Dbeatp from "./Dbeatp";
+import Dbdatp from "./Dbdatp";
+
 const StaticsRouter = [
     { path: 'infpty', component: Infpty, name: 'StaticsInfpty', meta: { title: '客户查询' } },
     { path: 'dbapty', component: Dbapty, name: 'StaticsDbapty', meta: { title: '客户新增' } },
@@ -91,6 +97,13 @@ const StaticsRouter = [
     { path: 'dbibch/:inr', component: Dbibch, name: 'StaticsDbibch', meta: { title: (tag) => { return '客户详情: ' + tag.params.inr } } },
     { path: 'dbebch/:inr', component: Dbebch, name: 'StaticsDbebch', meta: { title: (tag) => { return '客户修改: ' + tag.params.inr } } },
     { path: 'dbdbch/:inr', component: Dbdbch, name: 'StaticsDbdbch', meta: { title: (tag) => { return '客户删除: ' + tag.params.inr } } },
+
+    { path: 'infatp', component: Infatp, name: 'StaticsInfatp', meta: { title: '交易配置信息查询' } },
+    { path: 'dbaatp', component: Dbaatp, name: 'StaticsDbaatp', meta: { title: '交易配置信息新增' } },
+    { path: 'dbeatp/:inr', component: Dbeatp, name: 'StaticsDbeatp', meta: { title: (tag) => { return '客户修改: ' + tag.params.inr } } },
+    { path: 'dbdatp/:inr', component: Dbdatp, name: 'StaticsDbdatp', meta: { title: (tag) => { return '客户删除: ' + tag.params.inr } } },
+    { path: 'dbiatp/:inr', component: Dbiatp, name: 'StaticsDbiatp', meta: { title: (tag) => { return '交易配置信息详情: ' + tag.params.inr } } },
+
 ] 
 
 export default StaticsRouter