Merge remote-tracking branch 'origin/develop' into develop

src/components/business/commonModel/fxdgrp/index.js

+import Pts from '../Pts.js'
+
+export default class Fxdgrp {
+    constructor() {
+        this.data = {
+            rec: {
+                ownref: "",			//  结售汇业务参考号		.fxtp.fxdgrp.rec.ownref
+                nam: "",			//  名称		.fxtp.fxdgrp.rec.nam
+                fxtyp: "",			//  结售汇类型		.fxtp.fxdgrp.rec.fxtyp
+                opndat: "",			//  登记日期		.fxtp.fxdgrp.rec.opndat
+                valdat: "",			//  起息日		.fxtp.fxdgrp.rec.valdat
+                rat: "",			//  对外牌价		.fxtp.fxdgrp.rec.rat
+                midrat: "",			//  中间价		.fxtp.fxdgrp.rec.midrat
+                quoref: "",			//  询价编号		.fxtp.fxdgrp.rec.quoref
+                fudref: "",			//  资金部编号		.fxtp.fxdgrp.rec.fudref
+                setdat: "",			//  远期交割日		.fxtp.fxdgrp.rec.setdat
+                setdatfrm: "",			//  择期交割起始日		.fxtp.fxdgrp.rec.setdatfrm
+                setdatto: "",			//  择期交割截止日		.fxtp.fxdgrp.rec.setdatto
+                trnman: "",			//  交易主体		.fxtp.fxdgrp.rec.trnman
+                trdint: "",			//  结售汇类型		.fxtp.fxdgrp.rec.trdint
+                trdout: "",			//  结售汇类型		.fxtp.fxdgrp.rec.trdout
+                acc: "",			//  外币结算账号		.fxtp.fxdgrp.rec.acc
+                acc2: "",			//  本币结算账号		.fxtp.fxdgrp.rec.acc2
+                dsp: "",			//  外币结算账号		.fxtp.fxdgrp.rec.dsp
+                dsp2: "",			//  本币结算账号		.fxtp.fxdgrp.rec.dsp2
+            },
+            blk: {
+                remark: "",			//  备注		.fxtp.fxdgrp.blk.remark
+            },
+            cbs: {
+                max: {
+                    cur: "",			//  Currency		.fxtp.fxdgrp.cbs.max.cur
+                    amt: "",			//  Balance		.fxtp.fxdgrp.cbs.max.amt
+                },
+                nom1: {
+                    cur: "",			//  Currency		.fxtp.fxdgrp.cbs.nom1.cur
+                    amt: "",			//  Balance		.fxtp.fxdgrp.cbs.nom1.amt
+                },
+                opn1: {
+                    cur: "",			//  Currency		.fxtp.fxdgrp.cbs.nom1.cur
+                    amt: "",			//  Balance		.fxtp.fxdgrp.cbs.nom1.amt
+                },
+                opn2: {
+                    cur: "",			//  Currency		.fxtp.fxdgrp.cbs.nom1.cur
+                    amt: "",			//  Balance		.fxtp.fxdgrp.cbs.nom1.amt
+                },
+            },
+            apl: {
+                pts: new Pts().data,
+            },
+            act: {
+                pts: new Pts().data,
+            },
+            age: {
+                pts: new Pts().data,
+            },
+            acc: {
+                pts: new Pts().data,
+            },
+        }
+
+    }
+}
\ No newline at end of file

src/page/Funds/FundsRouter.js

 const BusRouter = [
-  { path: 'inffxd', component: () => import("./Inffxd/views"), name: 'Inffxd', meta: { title: '资结售汇报表交易查询' }, module: 'Funds' },
-  { path: 'infftd', component: () => import("./Infftd1/views"), name: 'Infftd1', meta: { title: '资金拆借/头寸调拨报表交易查询' }, module: 'Funds' },
-  { path: 'fttatt', component: () => import("./Fttatt/views"), name: 'Fttatt', meta: { title: 'Fttatt' }, module: 'Funds' },
-  { path: 'fttfcm', component: () => import("./Fttfcm/views"), name: 'Fttfcm', meta: { title: '资金定存拆借登记及确认交易' }, module: 'Funds' },
-  { path: 'fttfcn', component: () => import("./Fttfcn/views"), name: 'Fttfcn', meta: { title: '定存拆借销账交易' }, module: 'Funds' },
-  { path: 'fttfee', component: () => import("./Fttfee/views"), name: 'Fttfee', meta: { title: '费用结算' }, module: 'Funds' },
-  { path: 'fttfmt', component: () => import("./Fttfmt/views"), name: 'Fttfmt', meta: { title: '定存拆借到期交易' }, module: 'Funds' },
-  { path: 'fttfre', component: () => import("./Fttfre/views"), name: 'Fttfre', meta: { title: '拆借函电往来' }, module: 'Funds' },
-  { path: 'fttpcm', component: () => import("./Fttpcm/views"), name: 'Fttpcm', meta: { title: '头寸调拨登记确认交易' }, module: 'Funds' },
-  { path: 'fttpcn', component: () => import("./Fttpcn/views"), name: 'Fttpcn', meta: { title: '头寸调拨销账交易' }, module: 'Funds' },
-  { path: 'fxtatt', component: () => import("./Fxtatt/views"), name: 'Fxtatt', meta: { title: 'Fxtatt' }, module: 'Funds' },
-  { path: 'fxteop', component: () => import("./Fxteop/views"), name: 'Fxteop', meta: { title: '代客外汇买卖录入' }, module: 'Funds' },
-  { path: 'fxteqo', component: () => import("./Fxteqo/views"), name: 'Fxteqo', meta: { title: '代客外汇买卖报价' }, module: 'Funds' },
-  { path: 'fxtfcm', component: () => import("./Fxtfcm/views"), name: 'Fxtfcm', meta: { title: '外币兑换平盘确认' }, module: 'Funds' },
-  { path: 'fxtfcn', component: () => import("./Fxtfcn/views"), name: 'Fxtfcn', meta: { title: '外币兑换平盘销账' }, module: 'Funds' },
-  { path: 'infcrd', component: () => import("./Infcrd/views"), name: 'Infcrd', meta: { title: '清算入口交易' }, module: 'Funds' },
+  { path: 'inffxd', component: () => import("./Inffxd/views"), name: 'Inffxd', meta: {keepAlive: true, title: '资结售汇报表交易查询' , module: 'funds' }},
+  { path: 'infftd', component: () => import("./Infftd1/views"), name: 'Infftd1', meta: {keepAlive: true, title: '资金拆借/头寸调拨报表交易查询' , module: 'funds' }},
+  { path: 'fttatt', component: () => import("./Fttatt/views"), name: 'Fttatt', meta: {keepAlive: true, title: 'Fttatt' , module: 'funds' }},
+  { path: 'fttfcm', component: () => import("./Fttfcm/views"), name: 'Fttfcm', meta: {keepAlive: true, title: '资金定存拆借登记及确认交易' , module: 'funds' }},
+  { path: 'fttfcn', component: () => import("./Fttfcn/views"), name: 'Fttfcn', meta: {keepAlive: true, title: '定存拆借销账交易' , module: 'funds' }},
+  { path: 'fttfee', component: () => import("./Fttfee/views"), name: 'Fttfee', meta: {keepAlive: true, title: '费用结算' , module: 'funds' }},
+  { path: 'fttfmt', component: () => import("./Fttfmt/views"), name: 'Fttfmt', meta: {keepAlive: true, title: '定存拆借到期交易' , module: 'funds' }},
+  { path: 'fttfre', component: () => import("./Fttfre/views"), name: 'Fttfre', meta: {keepAlive: true, title: '拆借函电往来' , module: 'funds' }},
+  { path: 'fttpcm', component: () => import("./Fttpcm/views"), name: 'Fttpcm', meta: {keepAlive: true, title: '头寸调拨登记确认交易' , module: 'funds' }},
+  { path: 'fttpcn', component: () => import("./Fttpcn/views"), name: 'Fttpcn', meta: {keepAlive: true, title: '头寸调拨销账交易' , module: 'funds' }},
+  { path: 'fxtatt', component: () => import("./Fxtatt/views"), name: 'Fxtatt', meta: {keepAlive: true, title: 'Fxtatt' , module: 'funds'} },
+  { path: 'fxteop', component: () => import("./Fxteop/views"), name: 'Fxteop', meta: {keepAlive: true, title: '代客外汇买卖录入' , module: 'funds'} },
+  { path: 'fxteqo', component: () => import("./Fxteqo/views"), name: 'Fxteqo', meta: {keepAlive: true, title: '代客外汇买卖报价' , module: 'funds'} },
+  { path: 'fxtfcm', component: () => import("./Fxtfcm/views"), name: 'Fxtfcm', meta: {keepAlive: true, title: '外币兑换平盘确认' , module: 'funds'} },
+  { path: 'fxtfcn', component: () => import("./Fxtfcn/views"), name: 'Fxtfcn', meta: {keepAlive: true, title: '外币兑换平盘销账' , module: 'funds' }},
+  { path: 'infcrd', component: () => import("./Infcrd/views"), name: 'Infcrd', meta: {keepAlive: true, title: '清算入口交易' , module: 'funds' }},
   {
     path: "fxtfop",
     component: () => import("./Fxtfop/views"),
     name: "fxtfop",
-    meta: { title: "外币兑换平盘登记" },
-    module: "Funds",
+    meta: {keepAlive: true, title: "外币兑换平盘登记" , module: "funds"},
   },
-  { path: 'fxtlcm', component: () => import("./Fxtlcm/views"), name: 'Fxtlcm', meta: { title: '结售汇平盘确认交易' }, module: 'Funds' },
-  { path: 'fxtlcn', component: () => import("./Fxtlcn/views"), name: 'Fxtlcn', meta: { title: '结售汇平盘销账交易' }, module: 'Funds' },
+  { path: 'fxtlcm', component: () => import("./Fxtlcm/views"), name: 'Fxtlcm', meta: {keepAlive: true, title: '结售汇平盘确认交易' , module: 'funds'} },
+  { path: 'fxtlcn', component: () => import("./Fxtlcn/views"), name: 'Fxtlcn', meta: {keepAlive: true, title: '结售汇平盘销账交易' , module: 'funds'} },
   {
     path: "fxtlop",
     component: () => import("./Fxtlop/views"),
     name: "Fxtlop",
-    meta: { title: "结售汇平盘登记" },
-    module: "Funds",
+    meta: {keepAlive: true, title: "结售汇平盘登记" , module: "funds"},
   },
-  { path: 'fxtssb', component: () => import("./Fxtssb/views"), name: 'Fxtssb', meta: { title: '即期结汇交易' }, module: 'Funds' },
-  { path: 'fxtsss', component: () => import("./Fxtsss/views"), name: 'Fxtsss', meta: { title: '即期售汇交易' }, module: 'Funds' },
-  { path: 'crtcri', component: () => import("./Crtcri/views"), name: 'Crtcri', meta: { title: '汇入清算' }, module: 'Funds' },
-  { path: 'crtcro', component: () => import("./Crtcro/views"), name: 'Crtcro', meta: { title: '汇出清算' }, module: 'Funds' },
-  { path: 'fxtsqo', component: () => import("./Fxtsqo/views"), name: 'Fxtsqo', meta: { title: '结售汇报价' }, module: 'Funds' },
-  { path: 'crtcbk', component: () => import("./Crtcbk/views"), name: 'Crtcbk', meta: { title: '退汇清算' }, module: 'Funds' },
-  { path: 'crtctf', component: () => import("./Crtctf/views"), name: 'Crtctf', meta: { title: '转汇清算' }, module: 'Funds' },
+  { path: 'fxtssb', component: () => import("./Fxtssb/views"), name: 'Fxtssb', meta: {keepAlive: true, title: '即期结汇交易' , module: 'funds' }},
+  { path: 'fxtsss', component: () => import("./Fxtsss/views"), name: 'Fxtsss', meta: {keepAlive: true, title: '即期售汇交易' , module: 'funds'}},
+  { path: 'crtcri', component: () => import("./Crtcri/views"), name: 'Crtcri', meta: {keepAlive: true, title: '汇入清算' , module: 'funds' }},
+  { path: 'crtcro', component: () => import("./Crtcro/views"), name: 'Crtcro', meta: {keepAlive: true, title: '汇出清算' , module: 'funds' }},
+  { path: 'fxtsqo', component: () => import("./Fxtsqo/views"), name: 'Fxtsqo', meta: {keepAlive: true, title: '结售汇报价' , module: 'funds' }},
+  { path: 'crtcbk', component: () => import("./Crtcbk/views"), name: 'Crtcbk', meta: {keepAlive: true, title: '退汇清算' , module: 'funds' }},
+  { path: 'crtctf', component: () => import("./Crtctf/views"), name: 'Crtctf', meta: {keepAlive: true, title: '转汇清算' , module: 'funds' }},
 ];
 export default BusRouter

src/page/Remittance/Cpdsel/views/Infsea.vue

@@ -434,6 +434,7 @@ export default {
         {label: "正常解付", value: "0"},
         {label: "挂账待处理", value: "2"},
         {label: "挂账后解付", value: "G"},
+        {label: "退汇",value: "3"}
     ],
     };
   },