Skip to content

V
vue-gjjs
Commit e97f9975 by 潘际乾
Options

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

parents b21fb7ec 4ae8de17
Showing with 247 additions and 175 deletions
src/model/Infbdd/Event.js
......@@ -115,18 +115,30 @@ export default {
},
async handleSearch() {
this.stmData.data = [];
let opndatfrom = this.model.infcon.opndatfrom;
if(!opndatfrom || opndatfrom == ''){
this.$notify.error({ title: '错误', message: '查询开始日期必输！' });
return;
}
let opndatto = this.model.infcon.opndatto;
if(!opndatto || opndatto == ''){
this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
return;
}
let rtnmsg = await this.executeRule("infbut.searow")
if(rtnmsg.respCode == SUCCESS)
{
this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
let rtnmsg = await this.executeRule("infbut.searow")
if(rtnmsg.respCode == SUCCESS)
{
this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
display(index, row) {
debugger;
Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => {
......
src/model/Infdid/Event.js
......@@ -177,7 +177,17 @@ export default {
},
async handleSearch() {
this.stmData.data = [];
let opndatfrom = this.model.infcon.opndatfrom;
if(!opndatfrom || opndatfrom == ''){
this.$notify.error({ title: '错误', message: '查询开始日期必输！' });
return;
}
let opndatto = this.model.infcon.opndatto;
if(!opndatto || opndatto == ''){
this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
return;
}
let rtnmsg = await this.executeRule("infbut.searow")
if (rtnmsg.respCode == SUCCESS) {
this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
......
src/model/Sptsel/Event.js
......@@ -79,11 +79,21 @@ export default {
//let rtnmsg = await Api.post("getPendingData",{params:{'selsptinr':row[0]}})
//if (rtnmsg.respCode == SUCCESS) {
//var cacheFileName = rtnmsg.data.cacheFileName;
this.model.selsptinr = row['INR'];
let rtnmsg = await this.executeRule("tak")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
let trnName = row.交易代码.toLowerCase();
// let viewurl = "/business/ditopn?selsptinr=" + row[0];
//let viewurl = "/business/"+trnName+"?selsptinr=" + row['INR'];
let viewurl = "/business/"+trnName;
this.$router.push(viewurl);
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
let trnName = row.交易代码.toLowerCase();
// let viewurl = "/business/ditopn?selsptinr=" + row[0];
let viewurl = "/business/"+trnName+"?selsptinr=" + row['INR'];
this.$router.push(viewurl);
//}
},
async handleReset() {
......
src/model/Sptsel/index.js
......@@ -60,6 +60,7 @@ export default class Sptsel {
relamt:"", // Relevant Amount Optional .sptp.smh.relamt
},
},
selsptinr:"",
pageId: "" // ctx的key
}
}
......
src/utils/DocUtils.js 0 → 100644
export default class DocUtils{
//此用于获取返回的面函模板所在vo属性，参考后台Doceot.getDocRul实现。
static getDocAttribute(docnam,structure,execution){
let pfx = docnam.substring(0,docnam.length-1);
let idx = docnam.substr(docnam.length-1);
let attr = '';
switch(execution){
case 'P':
attr = pfx + structure + idx;
}
return attr+'blk';
}
}
\ No newline at end of file
src/views/Business/Bdtset/Utlp.vue
<template>
<div class="eibs-tab">
<c-col :span="11">
<c-col :span="13">
<c-col :span="22">
<c-col :span="24">
<c-col :span="11">
<c-col :span="12">
<el-form-item label="信用证参考号" prop="didgrp.rec.ownref">
<c-input
v-model="model.didgrp.rec.ownref"
......@@ -12,54 +13,57 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button
type="primary"
style="margin: 0 10px; padding: 0 10px"
<c-col :span="1" style="text-align: right;">
<c-button
style="margin:0;padding: 0 14px;"
size="small"
type="primary"
>
<span style="font-size:15px;font-family:'宋体';font-weight:bold">i</span>
</c-button>
</c-col>
<c-col :span="11">
<el-form-item
label="到期日"
prop="didgrp.rec.expdat"
label-width="30%"
>
<span style="font-size:15px;font-family:'宋体';font-weight:bold">i</span>
</c-button>
<c-date-picker
type="date"
v-model="model.didgrp.rec.expdat"
style="width: 100%"
placeholder="请选择Date of Expiry"
disabled
></c-date-picker>
</el-form-item>
</c-col>
</c-col>
<c-col :span="11">
<el-form-item
label="到期日"
prop="didgrp.rec.expdat"
label-width="40%"
>
<c-date-picker
type="date"
v-model="model.didgrp.rec.expdat"
style="width: 100%"
placeholder="请选择Date of Expiry"
disabled
></c-date-picker>
</el-form-item>
</c-col>
</c-col>
<c-col :span="11" :offset="1">
<c-col :span="13">
<el-form-item label="信用证余额" prop="didgrp.cbs.opn1.cur">
<c-input
v-model="model.didgrp.cbs.opn1.cur"
maxlength="3"
placeholder="请输入Currency"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="" prop="didgrp.cbs.opn1.amt" label-width="0">
<c-input
v-model="model.didgrp.cbs.opn1.amt"
placeholder="请输入Balance"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="11" :offset="1">
<c-col :span="12">
<el-form-item label="信用证余额" prop="didgrp.cbs.opn1.cur">
<c-input
v-model="model.didgrp.cbs.opn1.cur"
maxlength="3"
placeholder="请输入Currency"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="didgrp.cbs.opn1.amt" label-width="0">
<c-input
v-model="model.didgrp.cbs.opn1.amt"
placeholder="请输入Balance"
disabled
></c-input>
</el-form-item>
</c-col>
</c-col>
</c-col>
<c-col :span="24" style="height:24px">
<el-form-item label="单据信息" class="messageLabel">
</el-form-item>
......@@ -68,27 +72,28 @@
<el-divider></el-divider>
</c-col>
<c-col :span="11" style="margin-top:10px">
<c-col :span="13">
<el-form-item label="单据参考号" prop="bddgrp.rec.ownref">
<c-input
v-model="model.bddgrp.rec.ownref"
maxlength="16"
placeholder="请输入单据参考号"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="2"
><c-button
type="primary"
style="margin: 0 10px; padding: 0 10px"
>
<span style="font-size:15px;font-family:'宋体';font-weight:bold">i</span>
</c-button
></c-col>
<c-col :span="24">
<c-col :span="22">
<el-form-item label="单据参考号" prop="bddgrp.rec.ownref">
<c-input
v-model="model.bddgrp.rec.ownref"
maxlength="16"
placeholder="请输入单据参考号"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="2" style="text-align: right">
<c-button
style="margin:0;padding: 0 14px;"
size="small"
type="primary"
>
<span style="font-size:15px;font-family:'宋体';font-weight:bold">i</span>
</c-button>
</c-col>
</c-col>
</c-col>
<c-col :span="11" :offset="1" style="margin-top:10px">
......@@ -105,7 +110,7 @@
<!-- ==========middle-left======== -->
<c-col :span="11">
<c-col :span="24">
<c-col :span="13">
<c-col :span="12">
<el-form-item label="单据金额" prop="bddgrp.cbs.max.cur">
<c-select
v-model="model.bddgrp.cbs.max.cur"
......@@ -115,6 +120,9 @@
</c-select>
</el-form-item>
</c-col>
<c-col :span="1">
&nbsp;
</c-col>
<c-col :span="11">
<el-form-item label="" prop="bddgrp.cbs.max.amt" label-width="0">
<c-input
......@@ -127,7 +135,7 @@
</c-col>
<c-col :span="24">
<c-col :span="13">
<c-col :span="12">
<el-form-item label="单据余额" prop="bddgrp.cbs.opn1.cur">
<c-select
v-model="model.bddgrp.cbs.opn1.cur"
......@@ -136,7 +144,9 @@
></c-select>
</el-form-item>
</c-col>
<c-col :span="1">
&nbsp;
</c-col>
<c-col :span="11">
<el-form-item label="" prop="bddgrp.cbs.opn1.amt" label-width="0">
<c-input
......@@ -152,6 +162,7 @@
<el-form-item label="到单日期" prop="bddgrp.rec.rcvdat">
<c-date-picker
type="date"
style="width:100%"
v-model="model.bddgrp.rec.rcvdat"
placeholder="请选择到单日期"
disabled
......@@ -165,7 +176,7 @@
<el-form-item
label="远期起算日"
prop="bddgrp.rec.stadat"
label-width="40%"
label-width="30%"
>
<c-date-picker
type="date"
......@@ -183,8 +194,10 @@
<el-form-item label="单据到期日" prop="bddgrp.rec.matdat">
<c-date-picker
type="date"
style="width:100%"
v-model="model.bddgrp.rec.matdat"
placeholder="请选择Maturity Date"
width="100%"
disabled
></c-date-picker>
</el-form-item>
......@@ -196,7 +209,7 @@
<el-form-item
label="远期期限"
prop="bddgrp.rec.tenmaxday"
label-width="40%"
label-width="30%"
>
<c-input
v-model="model.bddgrp.rec.tenmaxday"
......@@ -344,8 +357,8 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="setmod.docamt" label-width="0">
<c-input
v-model="model.setmod.docamt"
......@@ -366,8 +379,8 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="setmod.redamt" label-width="0">
<c-input
v-model="model.setmod.redamt"
......@@ -389,8 +402,8 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="setmod.setamt" label-width="0">
<c-input
v-model="model.setmod.setamt"
......@@ -533,7 +546,7 @@
</c-col>
<c-col :span="24" style="height:24px">
<el-form-item label="表名表名表名" class="messageLabel">
<el-form-item label="待还融资" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height: 0px">
......
src/views/Business/Ditdck/index.vue
......@@ -107,7 +107,7 @@ import Coninfp from "~/views/Public/Coninfp";
import Limitbody from "~/views/Public/Limitbody";
export default {
name: "Infdid",
name: "Ditdck",
components: {
"m-litdckp": Litdckp,
"m-ovwp": Ovwp,
......
src/views/Business/Ditopn/Ovwp.vue
......@@ -92,7 +92,7 @@
&nbsp;
</c-col> -->
<c-col :span="13">
<c-col :span="11">
<c-form-item label="信用证金额" prop="didgrp.cbs.nom1.cur" previewLabel="信用证币种">
<c-select
disabled
......@@ -110,11 +110,11 @@
</c-select>
</c-form-item>
</c-col>
<c-col :span="11">
<c-col :span="13">
<c-form-item
previewLabel="信用证金额"
style="text-align: left"
label-width="10px"
label-width="5px"
prop="didgrp.cbs.nom1.amt"
>
<c-input-currency
......@@ -136,24 +136,22 @@
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="20">
<c-form-item label="上下浮动限额" prop="didgrp.rec.nomtop">
<c-input
v-model="model.didgrp.rec.nomtop"
maxlength="9"
style="width: 40%"
style="width: 48%"
placeholder="请输入Amount Tolerance - Positive"
></c-input>
<label style="display:inline-block;width:calc(20% - 15px);text-align:center;">-</label>
<label style="display:inline-block;width:calc(3% - 4px);text-align:center;">-</label>
<c-input
v-model="model.didgrp.rec.nomton"
maxlength="9"
style="width: 40%"
style="width: 48%"
placeholder="请输入Amount Tolerance - Negative"
></c-input>
</c-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12" style="text-align: left">
<el-form-item
label=""
......@@ -171,11 +169,11 @@
<!-- <c-col> &nbsp; </c-col> -->
<c-col :span="13">
<c-col :span="11">
<el-form-item label="信用证最大金额" prop="didgrp.cbs.max.cur">
<c-select
v-model="model.didgrp.cbs.max.cur"
style="width: 95%"
style="width: 100%"
placeholder="请选择Currency"
disabled
>
......@@ -190,8 +188,8 @@
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="" label-width="0" prop="didgrp.cbs.max.amt">
<c-col :span="13">
<el-form-item label="" label-width="5px" prop="didgrp.cbs.max.amt">
<c-input
v-model="model.didgrp.cbs.max.amt"
placeholder="请输入信用证最大金额"
......@@ -235,74 +233,69 @@
</c-col>
<c-col :span="24">
<c-col :span="20">
<c-form-item label="开证日期" prop="didgrp.rec.opndat">
<c-date-picker
style="width: 40%"
type="date"
v-model="model.didgrp.rec.opndat"
value-format="yyyy-MM-dd"
placeholder="请选择Date"
style="width:100%"
></c-date-picker>
</c-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="20">
<el-form-item
v-if="model.didgrp.rec.mytype == 'H'"
label="最迟货物装运日"
prop="didgrp.rec.shpdat"
>
<c-date-picker
type="date"
v-model="model.didgrp.rec.shpdat"
value-format="yyyy-MM-dd"
style="width: 40%"
placeholder="请选择Date"
></c-date-picker>
</el-form-item>
<el-form-item
v-if="model.didgrp.rec.mytype == 'F'"
label="最迟服务提供日"
prop="didgrp.rec.shpdat"
>
<c-date-picker
type="date"
v-model="model.didgrp.rec.shpdat"
value-format="yyyy-MM-dd"
style="width: 40%"
placeholder="请选择Date"
></c-date-picker>
</el-form-item>
<el-form-item
label="最迟货物装运日/服务提供日"
v-if="model.didgrp.rec.mytype == '3'"
prop="didgrp.rec.shpdat"
>
<c-date-picker
type="date"
v-model="model.didgrp.rec.shpdat"
value-format="yyyy-MM-dd"
style="width: 40%"
placeholder="请选择"
></c-date-picker>
</el-form-item>
</c-col>
<el-form-item
v-if="model.didgrp.rec.mytype == 'H'"
label="最迟货物装运日"
prop="didgrp.rec.shpdat"
>
<c-date-picker
type="date"
v-model="model.didgrp.rec.shpdat"
value-format="yyyy-MM-dd"
style="width: 100%"
placeholder="请选择Date"
></c-date-picker>
</el-form-item>
<el-form-item
v-if="model.didgrp.rec.mytype == 'F'"
label="最迟服务提供日"
prop="didgrp.rec.shpdat"
>
<c-date-picker
type="date"
v-model="model.didgrp.rec.shpdat"
value-format="yyyy-MM-dd"
style="width: 100%"
placeholder="请选择Date"
></c-date-picker>
</el-form-item>
<el-form-item
label="最迟货物装运日/服务提供日"
v-if="model.didgrp.rec.mytype == '3'"
prop="didgrp.rec.shpdat"
>
<c-date-picker
type="date"
v-model="model.didgrp.rec.shpdat"
value-format="yyyy-MM-dd"
style="width: 100%"
placeholder="请选择"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="20">
<c-form-item label="有效日期" prop="didgrp.rec.expdat">
<c-date-picker
style="width: 40%"
type="date"
v-model="model.didgrp.rec.expdat"
value-format="yyyy-MM-dd"
placeholder="请选择Date"
style="width:100%"
></c-date-picker>
</c-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-form-item label="有效地点" prop="didgrp.rec.expplc">
<c-input
......@@ -330,7 +323,7 @@
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="报文类型" label-width="80px">
<el-form-item label="报文类型" label-width="103px">
<c-select v-model="model.ditp.msgtyp" placeholder="请选择报文类型"
:code="getValues('ditp.msgtyp')"
:disabled="model.didgrp.rec.elcflg!='Y'" />
......
src/views/Business/Trnrel/InftrnpsDetail.vue
......@@ -291,10 +291,11 @@
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template>
<template>
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
@click="show(scope.$index,scope.row)"
>
Show
</c-button>
......@@ -336,15 +337,15 @@
<c-istream-table :list="SignaturesData.data" :columns="SignaturesData.columns" :paginationShow="false" style="width:100%">
<el-table-column label="Action" width="auto">
<template slot-scope="scope">
<!-- <span>{{JSON.stringify(scope.row)}}</span> -->
<el-select v-model="action[scope.row.IDX]" style="100%" disabled>
<span>{{action[scope.row.IDX]}}</span>
<!-- <el-select v-model="action[scope.row.IDX]" style="100%" disabled>
<el-option
v-for="item in codes.flg"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-select> -->
</template>
</el-table-column>
<!-- <el-table-column
......@@ -421,6 +422,7 @@ import Api from "~/service/Api"
import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Trnrel/Event"
import DocUtils from '~/utils/DocUtils'
export default {
name: "InftrnpsDetail",
......@@ -462,7 +464,8 @@ export default {
flg : CodeTable.flg,
atptxt : CodeTable.atptxt,
relstaEN : CodeTable.relstaEN,
usgtxt : CodeTable.usgtxt },
usgtxt : CodeTable.usgtxt,
wfetrssta : CodeTable.wfetrssta },
action:[],
}
},
......@@ -470,19 +473,25 @@ export default {
this.loadData()
},
methods: {
...Event,
loadData() {
// const { data } = this.$route.query
this.model = JSON.parse(sessionStorage.getItem('InftrnpsDetail'));
this.documentsData.data = this.model.recpan.smhstm.rows;
this.SignaturesData.data = this.model.recpan.trsstm.rows;
this.stmData.data = this.model.recpan.wfestm.rows;
console.log(this.SignaturesData.data)
var code = this.codes.flg;
for (let i = 0; i < this.SignaturesData.data.length; i++) {
const d = this.SignaturesData.data[i];
const items = d.split("\t");
this.action[i] = items[items.length - 2];
for(let j = 0; j < code.length; j++){
if(code[j].value === this.action[i]){
this.action[i] = code[j].label;
continue;
}
}
}
console.log(this.action)
},
exit(){
this.$store.dispatch("TagsView/delView", this.$route)
......@@ -499,7 +508,27 @@ export default {
}
});
},
...Event
async show(idx,row){
var params = {selDst:"recpan.smhstm",selIds:[idx+1],selBtnId:"A"}
let rtnmsg = await Api.post(`trnrel/executeRule/recpan.smhstm`, this.wrapper(params))
if (rtnmsg.respCode == SUCCESS) {
this.title = "面函"
let viewurl = "/#/docpan/show";
let XMLdata;
if (row.Type == 'LET') {
window.sessionStorage.docXML = ''
window.sessionStorage.docXML = rtnmsg.data.docimm_xmldocblk;
}
else if (row.pandsc == "MT799") {
window.sessionStorage.docTXT = ''
XMLdata = rtnmsg.data.litbenl1blk
}
window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' })
}
}
}
}
</script>
......
src/views/Public/Docpan.vue
......@@ -396,6 +396,7 @@
import CommonProcess from "~/mixin/CommonProcess";
import Api from "~/service/Api";
import Utils from "~/utils/index";
import DocUtils from '~/utils/DocUtils'
export default {
inject: ['root'],
props: ["model", "codes"],
......@@ -504,7 +505,7 @@ export default {
else{
//参考后台Doceot.butshw order=1000
let execution = 'P', structure = 'l'
let attr = this.getDocAttribute(docnam,structure,execution)
let attr = DocUtils.getDocAttribute(docnam,structure,execution)
window.sessionStorage.docTXT = ''
window.sessionStorage.docXML = rtnmsg.data[attr];
}
......@@ -529,17 +530,6 @@ export default {
this.dialog = rtnmsg.data.trnmod_trndoc_doceot[index]
this.index = index
}
},
//此用于获取返回的面函模板所在vo属性，参考后台Doceot.getDocRul实现。
getDocAttribute(docnam,structure,execution){
let pfx = docnam.substring(0,docnam.length-1);
let idx = docnam.substr(docnam.length-1);
let attr = '';
switch(execution){
case 'P':
attr = pfx + structure + idx;
}
return attr+'blk';
}
},
created: function () {},
......
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