Skip to content

V
vue-gjjs
Commit 8cda3e27 by fukai
Options

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

parents 43876596 213a0c8e
Showing with 109 additions and 82 deletions
src/model/Ditame/Pattern.js
......@@ -551,7 +551,7 @@ export default {
"didgrp.blk.insbnk":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
{max: 500,message:"长度不能超过500"}
],
"didgrp.blk.insbnkame":[
{type: "string", required: true, message: "必输项"},
......
src/model/Trnrel/Event.js
......@@ -355,7 +355,27 @@ export default {
// })
// }
const res = await this.executeRule("searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
const arr=[];
res.data.trncorco_trnstm.rows.forEach(element => {
switch(element.charAt(0)){
case 'W':
arr.push("Waiting"+element.substring(1));
break;
case 'C':
arr.push("Correct"+element.substring(1));
break;
case 'P':
arr.push("Picked up" + element.substring(1)) ;
break;
case 'N':
arr.push("Rejected" + element.substring(1)) ;
break;
default:
arr.push(element);
break;
}
});
that.$refs.inftrnps.stmData.data = arr;
this.model.trncorco.trnstm = res.data.trncorco_trnstm;
if(res.data.trncorco_trnstm.rows.length == 0){
this.$notify({
......
src/views/Business/Ditame/Inspame.vue
......@@ -9,7 +9,7 @@
<c-input
type="textarea"
v-model="model.didgrp.blk.insbnk"
maxlength="65"
maxlength="500"
show-word-limit
placeholder="请输入Instructions to Paying/Accepting/Negotiating Bank"
:rows="10"
......@@ -22,7 +22,7 @@
<c-input
type="textarea"
v-model="model.didgrp.blk.insbnkame"
maxlength="50"
maxlength="500"
show-word-limit
placeholder="请输入Instructions to P/A/N Amendment History"
:rows="10"
......
src/views/Business/Ditdck/Litdckp.vue
......@@ -154,7 +154,7 @@
type="date"
v-model="model.didgrp.rec.opndat"
disabled
style="width: 100%"
style="width: 95%"
placeholder="请选择开证日期"
>
</c-date-picker>
......@@ -180,7 +180,7 @@
type="date"
v-model="model.didgrp.rec.expdat"
disabled
style="width: 100%"
style="width: 95%"
placeholder="到期日"
>
</c-date-picker>
......@@ -526,7 +526,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="收款行名称">
<el-form-item label="收款行名称" prop="bddgrp.skh.pts.jigomc">
<c-input
type="textarea"
v-model="model.bddgrp.skh.pts.jigomc"
......@@ -603,7 +603,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="交单行联行名称(电证用)">
<el-form-item label="交单行联行名称(电证用)" prop="bddgrp.prb.pts.jigomc">
<c-input
type="textarea"
v-model="model.bddgrp.prb.pts.jigomc"
......@@ -617,7 +617,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="交单行地址(电证用)">
<el-form-item label="交单行地址(电证用)" prop="bddgrp.prb.pts.dizhii">
<c-input
type="textarea"
v-model="model.bddgrp.prb.pts.dizhii"
......
src/views/Business/Infdid/Infsea.vue
......@@ -330,16 +330,16 @@
>
处理
</c-button>
<!--
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="getDitSelInfo(scope.row['Reference'])"
@click="getDitSelInfo(scope.$index,scope.row)"
>
info
</c-button>
-->
</template>
</el-table-column>
</c-istream-table>
......@@ -539,6 +539,7 @@
</div>
</template>
<script>
import Utils from "~/utils/index"
import Api from "~/service/Api";
import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable";
......@@ -590,10 +591,17 @@ export default {
this.$router.history.push("/business/" + code)
this.initdialog = false
} ,
async getDitSelInfo(code){
//跳转交易
this.$router.history.push("/business/" + code)
this.initdialog = false
async getDitSelInfo(idx,row){
console.log(row);
var params = {selDst:"infbut.dspstm",selIds:[idx+1]}
let rtnmsg = await this.executeRule("infbut.dspstm", params);
console.log(rtnmsg)
if(rtnmsg.respCode = SUCCESS){
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
//触发父组件中updateShowPanel 事件，修改index中showPanel ，控制 index中组件的显示和隐藏
this.$emit('updateShowPanel', true)
}
},
created: function () {},
......
src/views/Business/Infdid/Tk.vue
<template>
<div class="eibs-tab">
<c-col :span="12">
<span v-text="model.recpan.hwfwms" data-path=".recpan.hwfwms" > </span>
<!--
<c-col :span="24">
<span v-text="model.ditp.hwfwms" data-path=".ditp.hwfwms" > </span>
</c-col>
<c-col :span="12">
<el-form-item label="Description of Goods" prop="didgrp.blk.lcrgod">
<c-input type="textarea" v-model="model.didgrp.blk.lcrgod" maxlength="65" show-word-limit placeholder="请输入Description of Goods" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" icon="el-icon-search" @click="onLcrgodButtxmsel">
...
</c-button>
-->
<c-col :span="24">
<el-form-item label="货物描述" prop="didgrp.blk.lcrgod">
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.lcrgod" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入Description of Goods" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-col :span="24">
<el-form-item label="单据要求" prop="didgrp.blk.lcrdoc">
<c-input type="textarea" v-model="model.didgrp.blk.lcrdoc" maxlength="65" show-word-limit placeholder="请输入单据要求" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" icon="el-icon-search" @click="onLcrdocButtxmsel">
...
</c-button>
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.lcrdoc" maxlength="1950" style="width:70%;margin-right:20px;" show-word-limit placeholder="请输入单据要求" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-col :span="24">
<el-form-item label="附加条款" prop="didgrp.blk.adlcnd">
<c-input type="textarea" v-model="model.didgrp.blk.adlcnd" maxlength="65" show-word-limit placeholder="请输入附加条款" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" icon="el-icon-search" @click="onAdlcndButtxmsel">
...
</c-button>
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.adlcnd" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入附加条款" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="付行的指示" prop="didgrp.blk.insbnk">
<c-input type="textarea" v-model="model.didgrp.blk.insbnk" maxlength="65" show-word-limit placeholder="请输入付行的指示" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" icon="el-icon-search" @click="onInsbnkButtxmsel">
...
</c-button>
<c-col :span="24">
<el-form-item label="给付款、承兑、议付行的指示" prop="didgrp.blk.insbnk">
<c-input type="textarea" :autosize="{ minRows: 6, maxRows: 8}" v-model="model.didgrp.blk.insbnk" style="width:70%;margin-right:20px;" maxlength="325" show-word-limit placeholder="请输入付行的指示" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.didgrp.rec.redclsflg">Red/Green Clause</c-checkbox>
</c-col>
<!-- <c-col :span="24">-->
<!-- <el-form-item label="" prop="didgrp.rec.redclsflg">-->
<!-- <c-checkbox v-model="model.didgrp.rec.redclsflg">红/绿条款</c-checkbox>-->
<!-- </el-form-item>-->
<!-- </c-col> -->
</div>
</template>
<script>
import Api from "~/service/Api"
import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Infdid/Event"
import Event from "~/model/Ditopn/Event"
export default {
inject: ['root'],
......
src/views/Business/Infdid/index.vue
......@@ -2,34 +2,40 @@
<div class="eContainer">
<div style="padding:0 5px">
<el-form :model="model" :rules="rules" ref="modelForm" label-width="110px" label-position="right" size="small" :validate-on-rule-change="false">
<!-- <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> -->
<!--PD000006 -->
<!-- <el-tab-pane label="信用证查询" name="infsea"> -->
<!-- <c-content> -->
<m-infsea :model="model" :codes="codes"/>
<m-infsea v-show="!showPanel" @updateShowPanel="updateShowPanel($event)" :model="model" :codes="codes"/>
<!-- </c-content> -->
<!-- </el-tab-pane> -->
<c-tabs v-model="tabVal" v-show="showPanel" ref="elment" type="card" @tab-click="tabClick">
<!--PD000001 -->
<!-- <el-tab-pane label="PD000001" name="ovwp">
<el-tab-pane label="基本信息" name="ovwp">
<m-ovwp :model="model" :codes="codes"/>
</el-tab-pane>-->
</el-tab-pane>
<!--PD000452 -->
<el-tab-pane label="其他当事人" name="detp1">
<m-detp1 :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000077 -->
<!-- <el-tab-pane label="PD000077" name="detp">
<el-tab-pane label="详细信息" name="detp">
<m-detp :model="model" :codes="codes"/>
</el-tab-pane> -->
</el-tab-pane>
<!--PD000342 -->
<!-- <el-tab-pane label="PD000342" name="tk">
<el-tab-pane label="单据要求" name="tk">
<m-tk :model="model" :codes="codes"/>
</el-tab-pane> -->
</el-tab-pane>
<!--PD000000 -->
<!-- <el-tab-pane label="PD000000" name="coninfp">
<el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane> -->
</el-tab-pane>
<!--PD000013 -->
<!-- <el-tab-pane label="PD000013" name="trnpan">
......@@ -86,21 +92,19 @@
<m-ordpan :model="model" :codes="codes"/>
</el-tab-pane> -->
<!--PD000452 -->
<!-- <el-tab-pane label="PD000452" name="detp1">
<m-detp1 :model="model" :codes="codes"/>
</el-tab-pane> -->
<!--PD000488 -->
<!-- <el-tab-pane label="PD000488" name="stament">
<m-stament :model="model" :codes="codes"/>
</el-tab-pane> -->
<!-- </c-tabs> -->
</c-tabs>
</el-form>
</div>
</div>
</template>
<script>
import Utils from "~/utils/index";
import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Infdid from "~/model/Infdid"
......@@ -112,7 +116,7 @@ import Infsea from "./Infsea"
import Ovwp from "./Ovwp"
import Detp from "./Detp"
import Tk from "./Tk"
import Coninfp from "./Coninfp"
import Coninfp from "~/views/Public/Coninfp";
import Trnpan from "./Trnpan"
import Cbsinfp from "./Cbsinfp"
import Cbeinfp from "./Cbeinfp"
......@@ -164,6 +168,7 @@ export default {
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
showPanel:false,
rules: null,
codes: {
},
......@@ -171,19 +176,35 @@ export default {
},
methods:{
tabClick(){
},
initPanel(val){
if(val){
this.tabVal = "ovwp"
//
}else{
this.tabVal = ""
}
},
async updateShowPanel(value) {
this.showPanel = value;
this.initPanel(value);
}
},
created:async function(){
console.log("进入infdid交易");
let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS)
{
this.updateModel(rtnmsg.data)
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
watch:{
}
}
</script>
......
src/views/Business/Sptsel/Sptbrk/Menu.vue
......@@ -377,8 +377,8 @@ export default {
stmData: {
columns: [
'4 1 "交易代码" 70 ',
'5 2 "业务编号" 270',
'6 3 "交易名称" 140',
'5 2 "业务编号" 300',
'6 3 "交易名称" 180',
'1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
'17 5 "报文类型" 100',
'18 6 "对方银行BIC" 110',
......
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