Commit a625f5ee by 潘际乾

getTrnNameByInr的临时替换

parent 757199d3
...@@ -140,14 +140,33 @@ export default { ...@@ -140,14 +140,33 @@ export default {
} }
}, },
display(index, row) { display(index, row) {
debugger; const name = row['交易名称'];
Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => { let trnName
if (res.respCode == SUCCESS) { if (name === '开立信用证') {
const trnName = res.data.toLowerCase(); trnName = 'ditopn'
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR'] } else if (name === '到单') {
window.open(viewurl, 'newwindow', 'height=1200,width=900,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no'); trnName = 'ditdck'
} } else if (name === '付款') {
}); trnName = 'bdtset'
} else if (name === 'Incoming payment') {
trnName = 'cptopn'
} else if (name === 'Outgoing payment') {
trnName = 'cptadv'
} else {
return;
}
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');
// 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
...@@ -30,13 +30,31 @@ export default { ...@@ -30,13 +30,31 @@ export default {
} }
}, },
display(index, row) { display(index, row) {
Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => { const name = row['交易名称'];
if (res.respCode == SUCCESS) { let trnName
const trnName = res.data.toLowerCase(); if (name === '开立信用证') {
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR'] trnName = 'ditopn'
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no'); } else if (name === '到单') {
} trnName = 'ditdck'
}); } else if (name === '付款') {
trnName = 'bdtset'
} else if (name === 'Incoming payment') {
trnName = 'cptopn'
} else if (name === 'Outgoing payment') {
trnName = 'cptadv'
} else {
return;
}
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');
// 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=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
// }
// });
}, },
async onInfbutUserow(){ async onInfbutUserow(){
let rtnmsg = await this.executeRule("infbut.userow") let rtnmsg = await this.executeRule("infbut.userow")
......
...@@ -198,14 +198,33 @@ export default { ...@@ -198,14 +198,33 @@ export default {
} }
}, },
display(index, row) { display(index, row) {
debugger; const name = row['交易名称'];
Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => { let trnName
if (res.respCode == SUCCESS) { if (name === '开立信用证') {
const trnName = res.data.toLowerCase(); trnName = 'ditopn'
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR'] } else if (name === '到单') {
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no'); trnName = 'ditdck'
} } else if (name === '付款') {
}); trnName = 'bdtset'
} else if (name === 'Incoming payment') {
trnName = 'cptopn'
} else if (name === 'Outgoing payment') {
trnName = 'cptadv'
} else {
return;
}
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');
// 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=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
// }
// });
}, },
} }
\ No newline at end of file
...@@ -47,19 +47,18 @@ module.exports = { ...@@ -47,19 +47,18 @@ module.exports = {
'^/gjjs/report': '/gjjs/report' '^/gjjs/report': '/gjjs/report'
} }
}, },
<<<<<<< HEAD
'/gjjs/notice/': { '/gjjs/notice/': {
target: 'http://127.0.0.1:8085', target: 'http://127.0.0.1:8085',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/gjjs/notice': '/gjjs/notice' '^/gjjs/notice': '/gjjs/notice'
======= }
},
'/gjjs/devtools/': { '/gjjs/devtools/': {
target: 'http://127.0.0.1:8083', target: 'http://127.0.0.1:8083',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/gjjs/devtools': '/gjjs/devtools' '^/gjjs/devtools': '/gjjs/devtools'
>>>>>>> e711bf965506eb41654c479eae2b7e633e370da4
} }
}, },
/** /**
...@@ -117,7 +116,7 @@ module.exports = { ...@@ -117,7 +116,7 @@ module.exports = {
.plugin('ScriptExtHtmlWebpackPlugin') .plugin('ScriptExtHtmlWebpackPlugin')
.after('html') .after('html')
.use('script-ext-html-webpack-plugin', [{ .use('script-ext-html-webpack-plugin', [{
// `runtime` must same as runtimeChunk name. default is `runtime` // `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/ inline: /runtime\..*\.js$/
}]) }])
.end() .end()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment