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 30 additions and 20 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/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