Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

# Conflicts:
#	src/views/Business/BusRouter.js

src/config/CodeTable/index.js

@@ -5826,5 +5826,9 @@ const CodeTable = {
 		{ label: "混合付款单据", value: "M" },
 		{ label: "即期单据", value: "P" },
 	],
+    infdsp: [
+		{ label: "Do not display", value: "" },
+		{ label: "Automatically display", value: "1" },
+	],
 }
 export default CodeTable;
\ No newline at end of file

src/model/Ditdck/index.js

 import Api from "~/service/Api"
 import Pts from "../Common/Pts"
+import Pub from "../Public"
 
 export default class Ditdck{
     constructor () {
@@ -204,31 +205,32 @@ export default class Ditdck{
 								doceot:[],
 							},
 						},
-						mtabut:{
-							syswrn:{
-								dsp:"",			//  Display		.mtabut.syswrn.dsp
-							},
-							coninf:{
-								oitinf:{
-									labinftxt:"",			//  Label for INFTXT		.mtabut.coninf.oitinf.labinftxt
-									oit:{
-										inftxt:"",			//  Infotext		.mtabut.coninf.oitinf.oit.inftxt
-										inflev:"",			//  Infotext Level		.mtabut.coninf.oitinf.oit.inflev
-									},
-								},
-								oitset:{
-									labinftxt:"",			//  Label for INFTXT		.mtabut.coninf.oitset.labinftxt
-									oit:{
-										inftxt:"",			//  Infotext		.mtabut.coninf.oitset.oit.inftxt
-										inflev:"",			//  Infotext Level		.mtabut.coninf.oitset.oit.inflev
-									},
-								},
-								conexedat:"",			//  执行日期		.mtabut.coninf.conexedat
-								usr:{
-									extkey:"",			//  User ID		.mtabut.coninf.usr.extkey
-								},
-							},
-						},
+						// mtabut:{
+						// 	syswrn:{
+						// 		dsp:"",			//  Display		.mtabut.syswrn.dsp
+						// 	},
+						// 	coninf:{
+						// 		oitinf:{
+						// 			labinftxt:"",			//  Label for INFTXT		.mtabut.coninf.oitinf.labinftxt
+						// 			oit:{
+						// 				inftxt:"",			//  Infotext		.mtabut.coninf.oitinf.oit.inftxt
+						// 				inflev:"",			//  Infotext Level		.mtabut.coninf.oitinf.oit.inflev
+						// 			},
+						// 		},
+						// 		oitset:{
+						// 			labinftxt:"",			//  Label for INFTXT		.mtabut.coninf.oitset.labinftxt
+						// 			oit:{
+						// 				inftxt:"",			//  Infotext		.mtabut.coninf.oitset.oit.inftxt
+						// 				inflev:"",			//  Infotext Level		.mtabut.coninf.oitset.oit.inflev
+						// 			},
+						// 		},
+						// 		conexedat:"",			//  执行日期		.mtabut.coninf.conexedat
+						// 		usr:{
+						// 			extkey:"",			//  User ID		.mtabut.coninf.usr.extkey
+						// 		},
+						// 	},
+						// },
+						mtabut: new Pub().data.Mtabut,
 						liaall:{
 							misamt:"",			//  Amount not yet assigned		.liaall.misamt
 							concur:"",			//  External Booking Amount		.liaall.concur

src/model/Infbdd/Event.js

@@ -127,5 +127,15 @@ export default {
                     this.$notify.error({title: '错误',message: '服务请求失败！'});
                     }
                 },
+                display(index, row) {
+                    debugger;
+                    Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => {
+                        if (res.respCode == SUCCESS) {
+                          const trnName = res.data.toLowerCase();
+                          let viewurl = "/#/display/" + trnName + "?trn=" + row['INR']
+                          window.open(viewurl, 'newwindow', 'height=1200,width=900,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
+                        }
+                    });
+                },
 
 }
\ No newline at end of file

src/model/Infbdd/index.js

@@ -64,6 +64,7 @@ export default class Infbdd{
 							diastm:"",			//  stream for diaries to selected contract		.infcon.diastm
 							liastm:"",			//  Stream for all engagements to selected contract		.infcon.liastm
 							ordstm:"",			//  Stream for Orders for Contract		.infcon.ordstm
+							objinr:"",
 						},
 						seadocflg:"",			//  Document Type		.seadocflg
 						infbut:{
@@ -117,6 +118,7 @@ export default class Infbdd{
 							rec:{
 								ownref:"",			//  信用证参考号		.didgrp.rec.ownref
 								expdat:"",			//  Date of Expiry		.didgrp.rec.expdat
+								inr:"",
 							},
 							cbs:{
 								opn1:{

src/model/Infdid/Event.js

@@ -193,7 +193,7 @@ export default {
             if (res.respCode == SUCCESS) {
               const trnName = res.data.toLowerCase();
               let viewurl = "/#/display/" + trnName + "?trn=" + row['INR']
-              window.open(viewurl, 'newwindow', 'height=1200,width=900,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
+              window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
             }
         });
     },

src/views/Business/BusRouter.js

@@ -96,14 +96,17 @@ import Bttrcl from "./Bttrcl"
 import Betacc from "./Betacc"
 import Betrcl from "./Betrcl"
 import InftrnpsDetail from "./Trnrel/InftrnpsDetail"
+import TrnfndsDetail from "./Trnrel/Trnfnd/TrnfndsDetail"
 import Sptpopup from "./Sptsel/Sptpopup"
 
 /**
  * 带有name的才会被添加进顶部的标签页里
  */
 const BusRouter = [
-  { path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '详情' } },  
-  { path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '详情' } },  
+  { path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '详情' } },
+  { path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '详情' } },
+  { path: 'trnfndsDetail', component: TrnfndsDetail, name: 'TrnfndsDetail', meta: { title: '已完成详情' } },
+  { path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '待复核详情' } },
   { path: 'cltdav', component: Cltdav, name: 'Cltdav', meta: { title: '打包托收开立' } },
   { path: 'clttra', component: Clttra, name: 'Clttra', meta: { title: '打包托收催收' } },
   { path: 'cltset', component: Cltset, name: 'Cltset', meta: { title: '打包托收解包' } },