Skip to content

V
vue-gjjs
Commit 62bacebd by wangren
Options

Merge branch 'development-202206' of http://192.168.0.110:11080/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://192.168.0.110:11080/fukai/vue-gjjs into development-202206
parents 685b900d 90d7e248
Showing with 111 additions and 93 deletions
src/config/CodeTable/index.js
......@@ -6369,6 +6369,10 @@ const CodeTable = {
{ label: "Beneficiary", value: "BENE" },
{ label: "ISS issuing Bank", value: "ISS" }
],
ptydbt_setpan: [
{ label: "OWN Ourselves", value: "OWN" },
{ label: "Advising Bank", value: "ADV" },
],
acccur: [
{ label: `CNY-人民币`, value: `CNY` },
{ label: `USD-美元`, value: `USD` },
src/model/Ditdav/Pattern.js
......@@ -343,13 +343,13 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"bddgrp.blk.docdis":[
{type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"}
//{type: "string", required: true, message: "必输项"},
{max: 3500,message:"长度不能超过3500"}
],
"bddgrp.blk.nartxt77a":[
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 700,message:"长度不能超过700"}
],
"bdtp.rmbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......
src/utils/index.js
......@@ -209,7 +209,6 @@ export default class Utils {
this.executeNotify().then(res => {
if (res.respCode == SUCCESS){
const data = res.data;
console.log(data)
Utils.copyValueFromVO(this.model, data)
if (typeof callback === "function") {
callback()
......
src/views/Business/Detopn/Detp2.vue
......@@ -79,7 +79,7 @@
<c-input
type="textarea"
v-model="model.dedgrp.rec.sdsrfs"
:disabled="this.mytypeFlag"
:disabled="model.dedgrp.rec.tratyp!='08' && model.dedgrp.rec.mytype!='F'"
maxlength="140"
show-word-limit
placeholder="请输入"
......@@ -214,9 +214,6 @@ export default {
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {
mytypeFlag: true,
};
},
methods: { ...Event },
created: function () {},
......
src/views/Business/Ditdav/Mt750p.vue
......@@ -119,7 +119,7 @@
<c-col>
<c-col :span="12">
<el-form-item label="Discrepancies" prop="bddgrp.blk.docdis">
<c-input type="textarea" :disabled="model.bddgrp.blk.docdisflg!='X'" v-model="model.bddgrp.blk.docdis" :rows="6" maxlength="50" show-word-limit placeholder="请输入Discrepancies" ></c-input>
<c-input type="textarea" :disabled="model.bddgrp.blk.docdisflg!='X'" v-model="model.bddgrp.blk.docdis" :rows="6" maxlength="3500" show-word-limit placeholder="请输入Discrepancies" ></c-input>
</el-form-item>
</c-col>
</c-col>
......
src/views/Business/Ditdav/Mt754p.vue
......@@ -228,7 +228,7 @@
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="Narrative TAG 77A of MT754" prop="bddgrp.blk.nartxt77a">
<c-input type="textarea" v-model="model.bddgrp.blk.nartxt77a" :rows="15" maxlength="35" show-word-limit placeholder="请输入Narrative TAG 77A of MT754" ></c-input>
<c-input type="textarea" v-model="model.bddgrp.blk.nartxt77a" :rows="15" maxlength="700" show-word-limit placeholder="请输入Narrative TAG 77A of MT754" ></c-input>
</el-form-item>
</c-col>
......
src/views/Business/Infbcd/Infsea.vue
......@@ -3,9 +3,9 @@
<c-list-search @form-reset="handleReset" @form-search="handleSearch">
<!-- 持续展示区 -->
<template v-slot="searchSlot">
<el-form class="m-table-search-form" ref="paramsForm" :inline="true" label-position="left" label-width="110px"
<el-form class="m-table-search-form" ref="paramsForm" :inline="true" label-position="right" label-width="110px"
size="small">
<el-row>
<c-row>
<c-col :span="24">
<c-col :span="8">
<el-form-item label="Own Reference" prop="infcon.seaownref" style="width: 100%">
......@@ -33,74 +33,105 @@
</el-form-item>
</c-col>
</c-col>
</el-row>
</c-row>
<c-row v-show="searchSlot.searchToggle">
<c-col :span="24">
<c-col :span="8">
<!-- <c-col :span="8">
<el-form-item label="Release Status" prop="infcon.relflg" style="width: 100%">
<!-- <c-select v-model="model.infcon.relflg" style="width: 100%" placeholder="请选择Release Status">
</c-select> -->
<c-select v-model="model.infcon.relflg" style="width: 100%" placeholder="请选择Release Status">
<el-option v-for="item in codes.relflg" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="8">
</c-col> -->
<!-- <c-col :span="8">
<el-form-item label="Handling Type" prop="infcon.hndtyp" style="width: 100%">
<!-- <c-select v-model="model.infcon.hndtyp" style="width: 100%" placeholder="请选择Handling Type">
</c-select> -->
<c-select v-model="model.infcon.hndtyp" style="width: 100%" placeholder="请选择Handling Type">
<el-option v-for="item in codes.hndtyp" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="8">
<el-form-item label="Select Single Party" prop="infcon.pty.extkey" style="width: 100%">
<c-input v-model="model.infcon.pty.extkey" maxlength="24" placeholder="请输入Select Single Party">
</c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="Resp.User" prop="infcon.usr.extkey" style="width: 100%">
<c-input v-model="model.infcon.usr.extkey" maxlength="8" placeholder="请输入User ID"></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="Role" prop="infcon.searol" style="width: 100%">
<!-- <c-select v-model="model.infcon.searol" style="width: 100%" placeholder="请选择Role">
</c-select> -->
<c-select v-model="model.infcon.payrol" style="width: 100%" placeholder="请选择Role">
<el-option v-for="item in codes.payrol" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="8">
<!-- <c-col :span="8">
<el-form-item label="External Visible Name" prop="infcon.pty.nam" style="width: 100%">
<c-input v-model="model.infcon.pty.nam" maxlength="40" placeholder="请输入External Visible Name">
</c-input>
</el-form-item>
</c-col> -->
<c-col :span="8">
<el-form-item label="Party Name" prop="infcon.pty.nam" style="width: 100%">
<c-input v-model="model.infcon.pty.nam" maxlength="40" placeholder="请输入External Visible Name">
</c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="Party Name/BIC" prop="infcon.seapty" style="width: 100%">
<c-input v-model="model.infcon.seapty" maxlength="24" placeholder="请输入Party Name/BIC"></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="Role" prop="infcon.searol" style="width: 100%">
<!-- <c-select v-model="model.infcon.searol" style="width: 100%" placeholder="请选择Role">
</c-select> -->
<c-select v-model="model.infcon.payrol" style="width: 100%" placeholder="请选择Role">
<el-option v-for="item in codes.payrol" :key="item.value" :label="item.label" :value="item.value">
<el-form-item label="Currency" prop="infcon.curtxt1" style="width: 100%">
<c-select v-model="model.infcon.curtxt1" style="width: 100%" placeholder="请选择Currency">
<el-option v-for="item in codes.curtxt1" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :sapn="24">
<c-col :span="24">
<c-col :span="8">
<el-form-item label="Name" prop="infcon.nam" style="width: 100%">
<c-input v-model="model.infcon.nam" maxlength="40" placeholder="请输入Name"></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="Amount between" prop="infcon.seaamtfr" style="width: 100%">
<c-col :span="11">
<c-input v-model="model.infcon.seaamtfr" placeholder="请输入Amount between"></c-input>
</c-col>
<c-col :span="2" style="text-align: center">
<label style="display: inline-block; width: 100%">-</label>
</c-col>
<c-col :span="11">
<c-input v-model="model.infcon.seaamtto" placeholder="请输入Amount to"></c-input>
</c-col>
</el-form-item>
</c-col>
<!-- <c-col :span="8">
<el-form-item label="User ID" prop="infcon.usr.extkey" style="width: 100%">
<c-input v-model="model.infcon.usr.extkey" maxlength="8" placeholder="请输入User ID"></c-input>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="8">
<el-form-item label="Status" prop="infcon.seasta" style="width: 100%">
<!-- <c-select v-model="model.infcon.seasta" style="width: 100%" placeholder="请选择Status">
......@@ -111,47 +142,44 @@
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<!-- <c-col :span="24">
<c-col :span="8">
<el-form-item label="Currency" prop="infcon.curtxt1" style="width: 100%">
<c-select v-model="model.infcon.curtxt1" style="width: 100%" placeholder="请选择Currency">
<el-option v-for="item in codes.curtxt1" :key="item.value" :label="item.label" :value="item.value">
<el-form-item label="是否显示查询码" prop="infcon.cxmflg" style="width: 100%">
<c-select v-model="model.infcon.cxmflg" style="width: 100%" placeholder="请选择是否显示查询码">
<el-option v-for="item in codes.cxmflg" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="24" style="margin-top:15px">
<c-col :span="8">
<el-form-item label="是否显示查询码" prop="infcon.cxmflg" style="width: 100%">
<!-- <c-select v-model="model.infcon.cxmflg" style="width: 100%" placeholder="请选择是否显示查询码">
</c-select> -->
<c-select v-model="model.infcon.cxmflg" style="width: 100%" placeholder="请选择是否显示查询码">
<el-option v-for="item in codes.cxmflg" :key="item.value" :label="item.label" :value="item.value">
<el-form-item label="Payment Condition" prop="doctypcod" style="width: 100%">
<c-select v-model="model.infcon.doctypcod" style="width: 100%" placeholder="请选择Payment Condition">
<el-option v-for="item in codes.doctypcod" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="8">
<c-col :span="12">
<el-form-item label="Amount between" prop="infcon.seaamtfr" style="width: 100%">
<c-input v-model="model.infcon.seaamtfr" placeholder="请输入Amount between"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Amount to" prop="infcon.seaamtto" style="width: 100%">
<c-input v-model="model.infcon.seaamtto" placeholder="请输入Amount to"></c-input>
</el-form-item>
</c-col>
<el-form-item label="Goods Code" prop="godcod" style="width: 100%">
<c-select v-model="model.infcon.godcod" style="width:100%" placeholder="请选择Goods Code">
<el-option v-for="item in codes.godcod" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="display stream" prop="infbut.dspstm">
<c-input v-model="model.infbut.dspstm" placeholder="请输入display stream"></c-input>
</el-form-item>
<!-- <c-col :span="24">
<c-col :span="8">
<el-form-item label="display stream" prop="infbut.dspstm" style="width: 100%">
<c-input v-model="model.infbut.dspstm" placeholder="请输入display stream"></c-input>
</el-form-item>
</c-col>
</c-col> -->
</c-row>
</el-form>
......@@ -159,27 +187,7 @@
</c-list-search>
<c-col :span="24" style="margin-top:15px">
<c-col :span="12">
<el-form-item label="Payment Condition" prop="seadoctypcod" style="width: 100%">
<!-- <c-select v-model="model.seadoctypcod" style="width: 100%" placeholder="请选择Payment Condition">
</c-select> -->
<c-select v-model="model.infcon.seadoctypcod" style="width: 100%" placeholder="请选择Payment Condition">
<el-option v-for="item in codes.seadoctypcod" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Goods Code" prop="godcod" style="width: 100%">
<c-select v-model="model.infcon.godcod" style="width:100%" placeholder="请选择Goods Code">
<el-option v-for="item in codes.godcod" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24" style="margin-top: 10px">
<c-button class="medium_bcs" size="medium" style="margin-left: 0px" type="primary" @click="toBctdav">寄单</c-button>
......@@ -228,9 +236,9 @@
</c-istream-table>
</c-col>
<m-busbtn ref="childs" :ownref="ownref" :model="BctselModel" ownrefPath="bcdgrp" trnCode="bctsel"
@onChoose="onChoose">11</m-busbtn>
<m-busbtn ref="childs" :ownref="ownref" :model="BctselModel" ownrefPath="bcdgrp" trnCode="bctsel"
@onChoose="onChoose">11</m-busbtn>
</div>
</template>
<script>
......@@ -301,8 +309,8 @@ export
},
async onChoose(code) {
//跳转交易
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
},
closeTrn(refId) {
this.$refs[refId].doClose();
......@@ -326,8 +334,8 @@ export
},
async getDitSelInfo(code) {
//跳转交易
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
},
toBctdav() {
......
src/views/Public/Setpan.vue
......@@ -61,8 +61,8 @@
:border="true">
<el-table-column label="Payer" prop="ptydbt" width="101px">
<template slot-scope="scope">
<c-select v-model="scope.row.ptydbt">
<el-option v-for="item in codes.ptydbt" :key="item.value" :label="item.value"
<c-select v-model="scope.row.ptydbt" @change="defaultFunction()">
<el-option v-for="item in codes.ptydbt_setpan" :key="item.value" :label="item.value"
:value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
......@@ -71,8 +71,8 @@
</el-table-column>
<el-table-column label="Payee" width="101px">
<template slot-scope="scope">
<c-select v-model="scope.row.ptypay">
<el-option v-for="item in codes.payee" :key="item.value" :label="item.value"
<c-select v-model="scope.row.ptypay" @change="defaultFunction()">
<el-option v-for="item in codes.ptydbt_setpan" :key="item.value" :label="item.value"
:value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
......@@ -192,7 +192,7 @@
:border="true">
<el-table-column label="Role" width="101px">
<template #default="scope">
<c-select v-model="scope.row.rol">
<c-select v-model="scope.row.rol" @change="defaultFunction()">
<el-option v-for="item in codes.setfelRol" :key="item.value" :label="item.value"
:value="item.value">
<span style="float: left">{{ item.label }}</span>
......@@ -200,7 +200,15 @@
</c-select>
</template>
</el-table-column>
<el-table-column label="Code" prop="feecod" width="101px">
<el-table-column label="Code" width="101px">
<template #default="scope">
<c-select v-model="scope.row.feecod" @change="selectOrCheckboxRule('setmod.setfeg.setfel.feecod')">
<el-option v-for="item in codes.fepfeecod" :key="item.value" :label="item.value"
:value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</c-select>
</template>
</el-table-column>
<el-table-column label="Source" prop="src" width="70px">
</el-table-column>
......@@ -220,8 +228,8 @@
</el-table-column>
<el-table-column label="Currency" prop="cur" width="100px">
</el-table-column>
<el-table-column label="Original Amount" prop="ogiamt" width="150px">
</el-table-column>
<!-- <el-table-column label="Original Amount" prop="ogiamt" v-model="ogiamt" width="150px"> -->
<!-- </el-table-column> -->
<el-table-column label="Fee Amount" prop="amt" width="150px">
</el-table-column>
<el-table-column label="" prop="det" width="80px" fixed="right">
......@@ -954,9 +962,11 @@ export default {
addRowSetfol() {
let newRow = { ...this.dialog };
this.model.setmod.setfog.setfol.splice(0, 0, newRow);
this.defaultFunction();
},
removeRowSetfol() {
this.model.setmod.setfog.setfol.shift();
this.defaultFunction();
},
saveDialog() {
this.dialogVisible = false;
......@@ -966,9 +976,11 @@ export default {
addRowSetfel() {
let newRow = { ...this.dialog2 };
this.model.setmod.setfeg.setfel.splice(0, 0, newRow);
this.defaultFunction();
},
removeRowSetfel() {
this.model.setmod.setfeg.setfel.shift();
this.defaultFunction();
},
detail1(index, row) {
this.executeDefault("setfel.det").then(res => {
......@@ -977,13 +989,11 @@ export default {
this.dialog = row;
this.index = index;
})
},
dispDefault(index) {
this.executeDefault(`setmod.setfeg.setfel(${index}).mac`).then(res => {
Utils.copyValueFromVO(this.model, res.data)
})
},
// 第二个表格
detail2(index, row) {
......
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