Skip to content

V
vue-gjjs
Commit d124653b by panziyi
Options

Bctset修改

parent bf6e6d8a
Showing with 139 additions and 32 deletions
debug.log
[0906/090726.874:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event [0908/094200.007:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
[0908/141403.897:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
[0909/090947.311:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
src/config/CodeTable/index.js
...@@ -3407,7 +3407,7 @@ const CodeTable = { ...@@ -3407,7 +3407,7 @@ const CodeTable = {
{ label: "浮动点", value: "1" }, { label: "浮动点", value: "1" },
{ label: "不浮动", value: "0" }, { label: "不浮动", value: "0" },
{ label: "浮动比率", value: "2" }, { label: "浮动比率", value: "2" },
{ lable: "按协议", value: "3" }, { label: "按协议", value: "3" },
], ],
fmt: [ fmt: [
{ label: "HTML", value: "HTM" }, { label: "HTML", value: "HTM" },
...@@ -5043,7 +5043,7 @@ const CodeTable = { ...@@ -5043,7 +5043,7 @@ const CodeTable = {
rebkpflg2: [ rebkpflg2: [
{ label: "Reverse Booking (Claim)", value: "N" }, { label: "Reverse Booking (Claim)", value: "N" },
{ label: "Reverse Booking (Claim, Guarantee)", value: "B" }, { label: "Reverse Booking (Claim, Guarantee)", value: "B" },
// { label: "Contract already settled" ,value: "A"} { label: "Contract already settled" ,value: "A"}
], ],
refper: [ refper: [
{ label: "Same Week", value: "W=" }, { label: "Same Week", value: "W=" },
......
src/model/Bctdav/index.js
...@@ -4,6 +4,12 @@ import Pub from "../Public" ...@@ -4,6 +4,12 @@ import Pub from "../Public"
export default class Bctdav{ export default class Bctdav{
constructor () { constructor () {
this.data = { this.data = {
bctdrrl1blk:"",
bctdrel1blk:"",
bctdrel2blk:"",
bctrogl1blk:"",
bctrogl2blk:"",
cnybop:{ cnybop:{
cnyflg:"", cnyflg:"",
traflg:"", traflg:"",
......
src/model/Bctrad/index.js
...@@ -4,6 +4,9 @@ import Pub from "../Public" ...@@ -4,6 +4,9 @@ import Pub from "../Public"
export default class Bctrad{ export default class Bctrad{
constructor () { constructor () {
this.data = { this.data = {
bctdrrl1blk:"",
bctdrel1blk:"",
bctdrel2blk:"",
bcdgrp:{ bcdgrp:{
rec:{ rec:{
ownref:"", // Collection Number .bcdgrp.rec.ownref ownref:"", // Collection Number .bcdgrp.rec.ownref
......
src/model/Bctset/index.js
...@@ -4,6 +4,8 @@ import Pub from "../Public" ...@@ -4,6 +4,8 @@ import Pub from "../Public"
export default class Bctset{ export default class Bctset{
constructor () { constructor () {
this.data = { this.data = {
bctdrel1blk:"",
bctdrrl1blk:"",
recgrp:{ recgrp:{
bas:{ bas:{
txccy:"", txccy:"",
......
src/views/Business/Bctrad/index.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</c-function-btn> </c-function-btn>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right"
size="small" :validate-on-rule-change="false"> size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--Additional Docs --> <!--Additional Docs -->
<el-tab-pane label="Additional Docs" name="bctret"> <el-tab-pane label="Additional Docs" name="bctret">
...@@ -114,11 +114,9 @@ ...@@ -114,11 +114,9 @@
} }
}, },
methods: { methods: {
tabClick(tab) { myTabClick(tab) {
if (this.isInDisplay) { this.tabClick(tab);
return let name = tab.name;
}
const name = tab.name
let rulePath; let rulePath;
if (name === "setpan") { if (name === "setpan") {
rulePath = "setmod.setpan"; rulePath = "setmod.setpan";
......
src/views/Business/Bctset/Bctsus.vue
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24" class="bctdav_bctp_bctovw_cheak"> <c-col :span="24" class="bctdav_bctp_bctovw_cheak">
<c-checkbox v-model="model.bcdgrp.rec.focflg" @change="focflgChange" <c-checkbox v-model="model.bcdgrp.rec.focflg" @change="frepayflgDefault"
>Free of Payment</c-checkbox >Free of Payment</c-checkbox
> >
</c-col> </c-col>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
</c-col> </c-col>
<c-col :span="24" class="bctdav_bctp_bctovw_cheak"> <c-col :span="24" class="bctdav_bctp_bctovw_cheak">
<c-checkbox true-label="C" v-model="model.mtabut.clsflg" @change="clsflgChange" <c-checkbox true-label="C" v-model="model.mtabut.clsflg" @change="clsflgOtherDefault"
>Close Contract</c-checkbox >Close Contract</c-checkbox
> >
</c-col> </c-col>
...@@ -280,6 +280,7 @@ ...@@ -280,6 +280,7 @@
<c-select <c-select
v-model="model.trnmod.cmtflg" v-model="model.trnmod.cmtflg"
style="width: 100%" style="width: 100%"
:disabled="model.bcdgrp.rec.focflg=='X'"
placeholder="" placeholder=""
> >
<el-option <el-option
...@@ -418,15 +419,62 @@ export default { ...@@ -418,15 +419,62 @@ export default {
mounted() { mounted() {
this.$nextTick(() => {}); this.$nextTick(() => {});
}, },
computed: {
crefinflg: {
get() {
if (this.model.bddgrp.rec.frepayflg == 'X') {
return false;
}else{
return this.model.trtcre.crefinflg != ''
}
},
set(val) {
this.model.trtcre.crefinflg = val ? "X" : ""
}
},
clsflg: {
get() {
return this.model.mtabut.clsflg=='C';
},
set(val) {
this.model.mtabut.clsflg = val ? "C" : "O"
}
},
frepayflg: {
get() {
return this.model.bddgrp.rec.frepayflg != ''
},
set(val) {
if (this.model.bddgrp.rec.frepayflg == 'X' ) {
this.model.trtcre.crefinflg = ''
this.model.trnmod.cmtflg="O"
}
this.model.bddgrp.rec.frepayflg = val ? "X" : ""
}
},
dfflag: {
get() {
return this.model.dftcre.dfflag != ''
},
set(val) {
this.model.dftcre.dfflag = val ? "X" : ""
}
},
},
methods: { methods: {
...Event, ...Event,
focflgChange(){ frepayflgDefault(){
this.executeCheck('bcdgrp.rec.focflg').then((res) => { this.executeDefault("trnmod.cmtflg").then((res) => {
if (res.respCode == SUCCESS) { if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data) Utils.copyValueFromVO(this.model, res.data);
} }
}) });
}, },
async crefinflgChange() { async crefinflgChange() {
let rtnmsg = await this.executeRule("trtcre.crefinflg"); let rtnmsg = await this.executeRule("trtcre.crefinflg");
...@@ -434,12 +482,19 @@ export default { ...@@ -434,12 +482,19 @@ export default {
Utils.copyValueFromVO(this.model, rtnmsg.data); Utils.copyValueFromVO(this.model, rtnmsg.data);
} }
}, },
async dfflagChange() { clsflgOtherDefault(){
let rtnmsg = await this.executeRule("dftcre.dfflag"); this.executeDefault("mtabut.clsflg").then((res) => {
if (rtnmsg.respCode == SUCCESS) { if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, rtnmsg.data); Utils.copyValueFromVO(this.model, res.data);
} }
});
}, },
// async dfflagChange() {
// let rtnmsg = await this.executeRule("dftcre.dfflag");
// if (rtnmsg.respCode == SUCCESS) {
// Utils.copyValueFromVO(this.model, rtnmsg.data);
// }
// },
async multipleSelect(selection) { async multipleSelect(selection) {
console.log(selection); console.log(selection);
if (selection.length > 1) { if (selection.length > 1) {
......
src/views/Business/Bctset/Dftcrep.vue
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="发票类型" prop="dftcre.dfdgrp.rec.invtyp"> <el-form-item label="发票类型" prop="dftcre.dfdgrp.rec.invtyp" label-width="110px">
<c-select <c-select
v-model="model.dftcre.dfdgrp.rec.invtyp" v-model="model.dftcre.dfdgrp.rec.invtyp"
style="width: 100%" style="width: 100%"
...@@ -238,17 +238,26 @@ ...@@ -238,17 +238,26 @@
v-model="model.dftcre.dfdgrp.rec.flttyp" v-model="model.dftcre.dfdgrp.rec.flttyp"
style="width: 100%" style="width: 100%"
placeholder="请选择利率浮动方式：" placeholder="请选择利率浮动方式："
:code="codes.flttyp1"
> >
<el-option
v-for="item in flttyp"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</c-select> </c-select>
<!-- <c-input v-model="model.dftcre.dfdgrp.rec.flttyp"></c-input> -->
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12" style="text-align: right">
<el-form-item label="浮动值" prop="dftcre.dfdgrp.rec.fltval"> <el-form-item label="浮动值" prop="dftcre.dfdgrp.rec.fltval" label-width="110px">
<c-input <c-input
:disabled="model.dftcre.dfdgrp.rec.flttyp=='0'||model.dftcre.dfdgrp.rec.flttyp=='3'"
v-model="model.dftcre.dfdgrp.rec.fltval" v-model="model.dftcre.dfdgrp.rec.fltval"
placeholder="请输入浮动值" placeholder="请输入浮动值"
style="width: 90%"
></c-input> ></c-input>
<span style="width: 10%" v-if="model.dftcre.dfdgrp.rec.flttyp=='2'">%</span>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -288,8 +297,8 @@ ...@@ -288,8 +297,8 @@
</c-col> --> </c-col> -->
<c-col :span="24"> <c-col :span="24">
<c-col :span="13"> <!-- <c-col :span="13"> -->
<el-form-item label="代付利息：" prop="dftcre.dfdgrp.rec.rescur"> <!-- <el-form-item label="代付利息：" prop="dftcre.dfdgrp.rec.rescur">
<c-select <c-select
v-model="model.dftcre.dfdgrp.rec.rescur" v-model="model.dftcre.dfdgrp.rec.rescur"
style="width: 100%" style="width: 100%"
...@@ -298,12 +307,12 @@ ...@@ -298,12 +307,12 @@
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col> -->
<c-col :span="11"> <c-col :span="24">
<el-form-item <el-form-item
label="" label="代付利息"
prop="dftcre.dfdgrp.rec.resamt" prop="dftcre.dfdgrp.rec.resamt"
label-width="5px"
> >
<c-input <c-input
v-model="model.dftcre.dfdgrp.rec.resamt" v-model="model.dftcre.dfdgrp.rec.resamt"
...@@ -422,6 +431,10 @@ ...@@ -422,6 +431,10 @@
v-model="model.dftcre.dfdgrp.dff.pts.ref" v-model="model.dftcre.dfdgrp.dff.pts.ref"
maxlength="16" maxlength="16"
placeholder="请输入代付行" placeholder="请输入代付行"
@keyup.enter.native="
showGridPromptDialog('dftcre.dfdgrp.dff.pts.ref')
"
>
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -626,9 +639,35 @@ export default { ...@@ -626,9 +639,35 @@ export default {
mixins: [commonProcess], mixins: [commonProcess],
data() { data() {
return { return {
flttyp: [
{ label: "浮动点", value: "1" },
{ label: "不浮动", value: "0" },
{ label: "浮动比率", value: "2" },
{ label: "按协议", value: "3" },
],
}; };
}, },
watch: {
"dftcre.dfdgrp.rec.invtyp": {
immediate:true,
handler(val,oldval){
if(this.model.dftcre.dfdgrp.rec.invtyp=="") {
this.model.dftcre.dfdgrp.rec.invtyp="1"
}
}
},
// "dftcre.dftcrep": {
// immediate:true,
// handler(val,oldval){
// if(this.model.trtcre.crefinflg=="") {
// this.model.dftcre.dfdgrp.rec.fintyp="A"
// }else if(this.model.trtcre.crefinflg=="X") {
// this.model.dftcre.dfdgrp.rec.fintyp="B"
// }
// }
// },
},
methods: { ...Event }, methods: { ...Event },
// created:function(){ // created:function(){
// this.executeRule("trdgrp.rec.actrat").then((res) => { // this.executeRule("trdgrp.rec.actrat").then((res) => {
......
src/views/Business/Bctset/index.vue
...@@ -56,7 +56,9 @@ ...@@ -56,7 +56,9 @@
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="Settlement" name="setpan"> <el-tab-pane label="Settlement" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" /> <m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Bookings" name="glepan"> <el-tab-pane label="Bookings" name="glepan">
......
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