Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

src/config/CodeTable/index.js

@@ -3694,7 +3694,6 @@ const CodeTable = {
   fxtyp: [
     { label: "售汇", value: "SH" },
     { label: "结汇", value: "JH" },
-    { label: "套汇", value: "TH" },
   ],
   genbro: [
     { label: "否", value: "" },

src/page/Funds/Inffxd/model/index.js

-import Api from "~/service/Api"
+import Api from "~/service/Api";
 
 export default class inffxd {
   constructor() {
@@ -7,15 +7,15 @@ export default class inffxd {
         seaownref: "", //  业务编号    		.infcon.seaownref
         seanam: "", //  业务名称		.infcon.nam
         opndat: "", //
-				opndatfrom: new Date((new Date).getTime() - (7 * 24 * 60 * 60 * 1000)),			//  有效日期自		.infcon.opndatfrom
+        opndatfrom: new Date(new Date().getTime() - 7 * 24 * 60 * 60 * 1000), //  有效日期自		.infcon.opndatfrom
         opndatto: new Date(), //  Open Date to		.infcon.opndatto
         seacur: "", //  币种		.infcon.seacur
         seaamtfr: "", //  金额自		.infcon.seaamtfr
         seaamtto: "", //  Amount to		.infcon.seaamtto
-				ownusr:"",
-				usr:"",
-				acc:"",
-				acc2:"",
+        ownusr: "",
+        usr: "",
+        acc: "",
+        acc2: "",
 
         searef: "",
         ptyextkey: "", //  选择一个参与方		.infcon.pty.extkey
@@ -31,7 +31,11 @@ export default class inffxd {
         dspstm: "", //  display stream		.infbut.dspstm
       },
       //fttyp: "",			//  Funds Trans. Type		.fttyp
-			pageId: ""			// ctx的key
-		}
+      pageId: "", // ctx的key
+      dbCodes: {
+        TRAINT: [],
+        TRAOUT: [],
+      },
+    };
   }
 }