Skip to content

V
vue-gjjs
Commit 5cebdec1 by 潘际乾
Options

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

parents df976a88 63a8db2f
Showing with 144 additions and 166 deletions
src/components/ListSearch.vue
......@@ -52,8 +52,8 @@ export default {
<style>
.m-table-search {
position: relative;
margin: -20px -20px 0 -30px;
padding: 20px 20px 10px 20px;
margin: -20px 0 0 0;
padding: 20px 0px 10px 20px;
border-bottom: 10px solid rgb(232, 232, 232);
}
.m-table-search-operation {
......
src/model/Cptadv/Pattern.js
......@@ -306,15 +306,6 @@ export default {
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bopmod.outchargeamt":[
{type: "number", required: false, message: "必输项"} ],
"setmod.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
......@@ -336,6 +327,10 @@ export default {
],
"setmod.glemod.gleshwstm":[
{type: "string", required: false, message: "必输项"},
{max: 1,message:"长度不能超过1"}
],
"mtabut.coninf.oitinf.oit.inftxt":[
{type: "string", required: true, message: "必输项"},
......@@ -412,4 +407,13 @@ export default {
"bopmod.outchargeamt":[
{type: "number", required: false, message: "必输项"} ],
}
\ No newline at end of file
src/model/Cptadv/index.js
import Api from "~/service/Api";
import Api from "~/service/Api"
import Pts from "../Common/Pts"
import Pub from "../Public"
export default class Cptadv{
constructor () {
this.data = {
......@@ -17,9 +19,9 @@ export default class Cptadv{
cur71f:"", // 发报行扣费金额 .cpdgrp.rec.cur71f
amt71f:"", // 发报行扣费金额 .cpdgrp.rec.amt71f
f23b:"", // 银行操作码 .cpdgrp.rec.f23b
pyeact:"", // 收款人账号 .cpdgrp.rec.pyeact
pyeact:"", // 收款人帐号 .cpdgrp.rec.pyeact
sztyp:"", // 收支类型 .cpdgrp.rec.sztyp
orcact:"", // 汇款人账号 .cpdgrp.rec.orcact
orcact:"", // 汇款人帐号 .cpdgrp.rec.orcact
trntyp:"", // 汇款性�'� .cpdgrp.rec.trntyp
paytype:"", // 汇款方式 .cpdgrp.rec.paytype
gors:"", // 收款对象 .cpdgrp.rec.gors
......@@ -140,6 +142,15 @@ export default class Cptadv{
payeecountcode:"", // 收款人常驻国家/地区代码 .cptp.payeecountcode
uetr:"", // Uetr .cptp.uetr
},
setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod,
lendoc:{
actflg:"", // Input Account .lendoc.actflg
account:"", // ACT .lendoc.account
vercerref:"", // Verification Certificate Number .lendoc.vercerref
decnum:"", // Declaration Number .lendoc.decnum
},
bopmod:{
szflg:"", // 申报类型 .bopmod.szflg
basflg:"", // 基础数据 .bopmod.basflg
......@@ -150,73 +161,6 @@ export default class Cptadv{
outchargeamt:"", // 国外银行扣费（涉外收入申报专用） .bopmod.outchargeamt
acttyp:"", // 款项来源 .bopmod.acttyp
},
setmod:{
docamttyplab:"", // settled amount description as label .setmod.docamttyplab
retmsg:"", // Label showing Retry overflow condition .setmod.retmsg
ref:"", // our reference .setmod.ref
doccur:"", // document currency .setmod.doccur
docamt:"", // document amount .setmod.docamt
dspflg:"", // Type of settlement .setmod.dspflg
xreflg:"", // Recalculate Rates .setmod.xreflg
setglg:{
labdspflg:"", // Label for Type of Settlement .setmod.setglg.labdspflg
},
zmqacclab:"", // 主�'�号LABEL .setmod.zmqacclab
zmqacc:"", // 自�'�区主�'�号 .setmod.zmqacc
setfog: {
setfol: []
},
setfeg: {
setfel: []
},
},
mtabut:{
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
},
},
},
trnmod:{
trndoc:{
advlabel:"", // ADVLABEL .trnmod.trndoc.advlabel
amdnam:"", // AMDNAM .trnmod.trndoc.amdnam
advdoc:"", // 国内证通知书 .trnmod.trndoc.advdoc
advnam:"", // 国内证落款 .trnmod.trndoc.advnam
amdapl:"", // 修改申请人名称 .trnmod.trndoc.amdapl
doclbl:"", // Lable for CONDOCSTM .trnmod.trndoc.doclbl
doctrestm:"", // Document tree .trnmod.trndoc.doctrestm
shwinc:"", // Show Incoming Messages .trnmod.trndoc.shwinc
shwout:"", // Show Outgoing Messages .trnmod.trndoc.shwout
condocstm:"", // Connected Documents .trnmod.trndoc.condocstm
rcvatt:{
seainf:"", // .trnmod.trndoc.rcvatt.seainf
},
filrecv:"", // File Receiver .trnmod.trndoc.filrecv
doceot: [],
},
},
lendoc:{
actflg:"", // Input Account .lendoc.actflg
account:"", // ACT .lendoc.account
vercerref:"", // Verification Certificate Number .lendoc.vercerref
decnum:"", // Declaration Number .lendoc.decnum
},
cnybop:{
cnyflg:"", // 是否报送跨境人民币2101表 .cnybop.cnyflg
traflg:"", // 是否报送跨境人民币2107表 .cnybop.traflg
......
src/model/Cptopn/Event.js
import Api from "~/service/Api"
import Utils from "~/utils/index"
export default {
async onCptpGetref() {
let rtnmsg = await this.executeRule("cptp_getref")
......@@ -218,10 +219,25 @@ export default {
},
async onOpnpButgetref() {
let rtnmsg = await this.executeRule("ditp.butgetref")
let rtnmsg = await this.executeRule("cptp.getref")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.model.didgrp.rec.ownref = rtnmsg.data.didgrp_rec_ownref
Utils.copyValueFromVO(this.model, rtnmsg.data);
this.$message({
type: 'success',
message: '获取成功！'
});
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
async swftypChange() {
let rtnmsg = await this.executeRule("cpdgrp.rec.swftyp")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
Utils.copyValueFromVO(this.model, rtnmsg.data);
this.$message({
type: 'success',
message: '获取成功！'
......
src/views/Business/Cptadv/Opnp1.vue
<template>
<div class="eibs-tab">
<c-row>
<!-- ============== 顶部============================== -->
<c-col :span="24">
<c-col :span="11">
<el-form-item label="业务编号" style="width:100%">
<el-form-item label="业务编号" style="width:100%" prop="cpdgrp.rec.ownref">
<c-fullbox>
<c-input
v-model="model.cpdgrp.rec.ownref"
......@@ -36,7 +35,7 @@
</c-col>
<c-col :span="11" :offset="1">
<el-form-item label="Name">
<el-form-item label="Name" prop="cpdgrp.rec.nam">
<c-input
v-model="model.cpdgrp.rec.nam"
maxlength="40"
......@@ -50,7 +49,7 @@
<!-- ========================左边======================= -->
<c-col :span="11">
<c-col :span="24">
<el-form-item label="清算编号" style="width:100%">
<el-form-item label="清算编号" style="width:100%" prop="cpdgrp.rec.sysno">
<c-fullbox>
<c-input
v-model="model.cpdgrp.rec.sysno"
......@@ -73,11 +72,12 @@
</c-col>
<c-col :span="13">
<el-form-item label="汇款金额">
<el-form-item label="汇款金额" prop="cpdgrp.cbs.nom1.cur">
<c-select
v-model="model.cpdgrp.cbs.nom1.cur"
style="width: 95%"
placeholder="请选择Currency"
@change="commonExecuteRule('cpdgrp.cbs.nom1.cur')"
>
<el-option
v-for="item in codes.cur"
......@@ -89,26 +89,26 @@
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="" label-width="0" style="text-align: left">
<el-form-item label="" label-width="0" style="text-align: left" prop="cpdgrp.cbs.nom1.amt">
<c-input
v-model="model.cpdgrp.cbs.nom1.amt"
style="text-align: left; width: 100%"
placeholder="请输入汇款金额"
@change="commonExecuteNotify()"
></c-input>
</el-form-item>
</c-col>
<c-col :span="13">
<el-form-item label="所属行">
<c-col :span="14">
<el-form-item label="所属行" prop="cpdgrp.rec.othbch">
<c-input
v-model="model.cpdgrp.rec.othbch"
maxlength="8"
placeholder="请输入所属行"
style="width:95%"
></c-input>
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="汇款语种" label-width="100px">
<c-col :span="10">
<el-form-item label="汇款语种" label-width="60px" style="margin-left: 12px" prop="cptp.payuil">
<c-select
v-model="model.cptp.payuil"
style="width: 100%"
......@@ -125,7 +125,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="付款人常驻国家/地区代码">
<el-form-item label="付款人常驻国家/地区代码" prop="cptp.draweecountcode">
<c-fullbox>
<c-input
v-model="model.cptp.draweecountcode"
......@@ -147,7 +147,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="我行费用负担">
<el-form-item label="我行费用负担" prop="cpdgrp.rec.detchgcod">
<c-select
v-model="model.cpdgrp.rec.detchgcod"
style="width: 100%"
......@@ -163,7 +163,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="货物类型">
<el-form-item label="货物类型" prop="cpdgrp.rec.stagod">
<c-select
v-model="model.cpdgrp.rec.stagod"
style="width: 100%"
......@@ -182,8 +182,8 @@
<!-- ========================右边======================= -->
<c-col :span="11" :offset="1">
<c-col :span="12">
<el-form-item label="汇款性质">
<c-col :span="13">
<el-form-item label="汇款性质" prop="cpdgrp.rec.trntyp">
<c-select
v-model="model.cpdgrp.rec.trntyp"
style="width: 100%"
......@@ -198,8 +198,8 @@
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="汇款方式">
<c-col :span="11">
<el-form-item label="汇款方式" label-width="40%" prop="cpdgrp.rec.paytype">
<c-select
v-model="model.cpdgrp.rec.paytype"
style="width: 100%"
......@@ -214,8 +214,8 @@
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="收款对象">
<c-col :span="13">
<el-form-item label="收款对象" prop="cpdgrp.rec.gors">
<c-select
v-model="model.cpdgrp.rec.gors"
style="width: 100%"
......@@ -231,8 +231,8 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="收支类型">
<c-col :span="11">
<el-form-item label="收支类型" label-width="40%" prop="cpdgrp.rec.sztyp">
<c-select
v-model="model.cpdgrp.rec.sztyp"
style="width: 100%"
......@@ -248,7 +248,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Uetr">
<el-form-item label="Uetr" prop="cptp.uetr">
<c-fullbox>
<c-input
v-model="model.cptp.uetr"
......@@ -264,8 +264,8 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="解付日期">
<c-col :span="13">
<el-form-item label="解付日期" prop="cpdgrp.rec.paydat">
<c-date-picker
type="date"
v-model="model.cpdgrp.rec.paydat"
......@@ -274,18 +274,19 @@
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="起息日">
<c-col :span="11">
<el-form-item label="起息日" label-width="40%" prop="cpdgrp.rec.valdat">
<c-date-picker
type="date"
v-model="model.cpdgrp.rec.valdat"
style="width: 100%"
placeholder="请选择起息日"
@change="commonExecuteNotify()"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="客户类型">
<c-col :span="13">
<el-form-item label="客户类型" prop="cpdgrp.rec.clityp">
<c-select
v-model="model.cpdgrp.rec.clityp"
style="width: 100%"
......@@ -301,12 +302,14 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="报文类型">
<c-col :span="11">
<el-form-item label="报文类型" label-width="40%" prop="cpdgrp.rec.swftyp">
<c-select
v-model="model.cpdgrp.rec.swftyp"
style="width: 100%"
placeholder="请选择报文类型"
@change="commonExecuteRule('cpdgrp.rec.swftyp')"
>
<el-option
v-for="item in codes.swftypOpnp"
......@@ -318,8 +321,8 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="国外费用">
<c-col :span="11">
<el-form-item label="国外费用" prop="cpdgrp.rec.feecur">
<c-select
v-model="model.cpdgrp.rec.feecur"
style="width: 100%"
......@@ -336,11 +339,12 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="" label-width="20px">
<c-col :span="13">
<el-form-item label="" label-width="10px" prop="cpdgrp.rec.feeamt">
<c-input
v-model="model.cpdgrp.rec.feeamt"
placeholder="请输入国外费用金额"
style="width: 64%"
></c-input>
<c-checkbox v-model="model.cpdgrp.rec.tsnflg"
>同名划转标志</c-checkbox
......@@ -1006,11 +1010,11 @@
<c-input type="textarea" v-model="model.cpdgrp.pye.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input>
</el-form-item>
</c-col> -->
</c-row>
</div>
</template>
<script>
import Api from "~/service/Api";
import Utils from "~/utils/index";
import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Cptadv/Event";
......@@ -1034,7 +1038,21 @@ export default {
};
},
methods: { ...Event,
onSeainf(){}
onSeainf(){},
commonExecuteRule(ruleName){
this.executeRule(ruleName).then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
commonExecuteNotify(){
this.executeNotify().then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
},
created: function () {
console.log(this.root);
......
src/views/Business/Cptadv/index.vue
<template>
<c-page title="汇入汇款">
<div class="eContainer">
<c-bus-button :$pntvm="this"></c-bus-button>
<!-- <c-bus-button :$pntvm="this"></c-bus-button> -->
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
<!-- <el-button size="small">使用模板</el-button> -->
<el-button size="small">制裁信息</el-button>
<!-- <el-button size="small">拆分报文</el-button> -->
<el-button size="small">智能提示</el-button>
</c-function-btn>
<el-form
:model="model"
:rules="rules"
......@@ -10,13 +23,13 @@
size="small"
>
<c-tabs ref="elment" :value="tabVal" type="card" @tab-click="tabClick">
<el-tab-pane label="Overview" name="opnp1">
<el-tab-pane label="基本信息" name="opnp1">
<!--PD000020 -->
<c-content>
<m-opnp1 :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="账务" name="setpan">
<el-tab-pane label="费用及账务" name="setpan">
<!--PD000006 -->
<m-setpan :model="model" :codes="codes" />
</el-tab-pane>
......@@ -55,10 +68,13 @@ import Utils from "~/utils/index";
import CodeTable from "~/config/CodeTable";
import Cptadv from "~/model/Cptadv";
import CommonProcess from "~/mixin/CommonProcess";
import Pattern from "~/model/Cptadv/Pattern";
import CommonFuncs from "~/mixin/CommonFuncs";
import Opnp1 from "./Opnp1";
import Docpan2 from "./Docpan2";
import Wg from "./Wg";
import Pattern from "~/model/Cptadv/Pattern";
import Default from "~/model/Cptadv/Default";
import Check from "~/model/Cptadv/Check";
// import Setpan from "./Setpan";
// import Coninfp from "./Coninfp";
// import Docpan from "./Docpan";
......@@ -88,7 +104,8 @@ export default {
root: this,
};
},
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
mixins: [CommonProcess,CommonFuncs], // 里面包含了Default、Check等的公共处理
computed: {},
data() {
return {
tabVal: "opnp1",
......@@ -96,7 +113,10 @@ export default {
model: new Cptadv().data,
// defaultRule:Default,
// rules:this.mergeRules(Pattern,Check),
rules: Pattern,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: { ...CodeTable },
};
},
......
src/views/Business/Cptopn/Opnp1.vue
......@@ -13,12 +13,12 @@
<c-col :span="11">
<el-form-item
label="业务编号"
prop="cptp.recget.sdamod.dadsnd"
prop="cpdgrp.rec.ownref"
style="width: 100%"
>
<c-fullbox>
<c-input
v-model="model.cptp.recget.sdamod.dadsnd"
v-model="model.cpdgrp.rec.ownref"
maxlength="16"
placeholder="请输入Reference"
disabled
......@@ -322,6 +322,7 @@
:disabled="
model.cpdgrp.cbs.nom1.amt === '0.000'
"
@change="swftypChange"
>
<!-- :disabled="model.cptp.liqtyp != 'C' && model.cptp.liqtyp != 'S' && model.cptp.liqtyp != ''" -->
<el-option
......@@ -465,14 +466,13 @@ export default {
...Event,
onCptpGetref() {},
onCptpGetmod() {},
},
created: function () {},
computed: {
flag() {
return (
this.model.cpdgrp.orc.pts.extkey == "" ||
this.model.cpdgrp.rec.ownref != ""
this.model.cpdgrp.orc.pts.extkey == ""
// && this.model.cpdgrp.rec.ownref != ""
);
},
},
......
src/views/Business/Cptopn/Payment103.vue
......@@ -383,21 +383,6 @@
<c-col :span="24">
<el-form-item label="Details of Charges(Tag 71a)" label-width="35%">
<c-select
v-model="model.cptp.liqtyp"
style="width: 100%"
placeholder="请选择清算模式"
:disabled="
model.cpdgrp.cbs.nom1.amt === '0.000'
"
>
<el-option
v-for="item in liqtypOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</c-select>
</el-form-item>
</c-col>
......@@ -426,20 +411,9 @@ import Event from "~/model/Cptopn/Event";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [CommonProcess],
data() {
return {};
},
watch: {
"model.cptp.qsfysd": function () {
if (this.model.cptp.qsfysd == "") {
this.model.cptp.fwtgyh == "";
} else {
this.model.cptp.fwtgyh = "CHASUS33XXX";
console.log(this.model.cptp.fwtgyh);
}
},
},
methods: { ...Event },
created: function () {},
};
......
src/views/Business/Cptopn/index.vue
......@@ -11,7 +11,7 @@
:validate-on-rule-change="false"
>
<el-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick">
<el-tab-pane label="Overview" name="opnp1">
<el-tab-pane label="汇款信息" name="opnp1">
<!--PD000020 -->
<c-content>
<m-opnp1 :model="model" :codes="codes" />
......@@ -23,7 +23,7 @@
<m-AdditionalInfo :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="Settlement" name="setpan">
<el-tab-pane label="账务" name="setpan">
<!--PD000000 -->
<m-setpan :model="model" :codes="codes" />
</el-tab-pane>
......@@ -33,17 +33,17 @@
<m-glepan :model="model" :codes="codes" ref="glepan"/>
</el-tab-pane>
<el-tab-pane label="Completion" name="coninfp">
<el-tab-pane label="附言" name="coninfp">
<!--PD000000 -->
<m-coninfp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="Messages" name="docpan">
<el-tab-pane label="报文及面函" name="docpan">
<!--PD000529 -->
<m-docpan :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="Attachments" name="doctre">
<el-tab-pane label="附件" name="doctre">
<!--PD000546 -->
<m-doctre :model="model" :codes="codes" />
</el-tab-pane>
......
src/views/Business/Infbdd/index.vue
......@@ -170,7 +170,7 @@
padding: 10px 0 10px 30px;
background-color: #f7faff;
}
.eContainer {
/* .eContainer {
padding: 3px 15px;
}
} */
</style>
\ No newline at end of file
src/views/Business/Infdid/index.vue
......@@ -254,8 +254,8 @@ export default {
}
</script>
<style scoped>
.eContainer {
/* .eContainer {
padding: 3px 15px;
}
} */
</style>
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