Skip to content

V
vue-gjjs
Commit 1381ed5a by wangna
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 3af4a228 24dc6e79
Showing with 240 additions and 111 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 = {
{ label: "浮动点", value: "1" },
{ label: "不浮动", value: "0" },
{ label: "浮动比率", value: "2" },
{ lable: "按协议", value: "3" },
{ label: "按协议", value: "3" },
],
fmt: [
{ label: "HTML", value: "HTM" },
......@@ -5043,7 +5043,7 @@ const CodeTable = {
rebkpflg2: [
{ label: "Reverse Booking (Claim)", value: "N" },
{ label: "Reverse Booking (Claim, Guarantee)", value: "B" },
// { label: "Contract already settled" ,value: "A"}
{ label: "Contract already settled" ,value: "A"}
],
refper: [
{ label: "Same Week", value: "W=" },
......
src/model/Bctdav/index.js
......@@ -4,6 +4,12 @@ import Pub from "../Public"
export default class Bctdav{
constructor () {
this.data = {
bctdrrl1blk:"",
bctdrel1blk:"",
bctdrel2blk:"",
bctrogl1blk:"",
bctrogl2blk:"",
cnybop:{
cnyflg:"",
traflg:"",
......
src/model/Bctrad/index.js
......@@ -4,6 +4,9 @@ import Pub from "../Public"
export default class Bctrad{
constructor () {
this.data = {
bctdrrl1blk:"",
bctdrel1blk:"",
bctdrel2blk:"",
bcdgrp:{
rec:{
ownref:"", // Collection Number .bcdgrp.rec.ownref
......
src/model/Bctset/index.js
......@@ -4,6 +4,8 @@ import Pub from "../Public"
export default class Bctset{
constructor () {
this.data = {
bctdrel1blk:"",
bctdrrl1blk:"",
recgrp:{
bas:{
txccy:"",
......
src/model/Cltdav/Event.js
......@@ -3,7 +3,6 @@ import Utils from "~/utils"
export default {
async handleSearch() {
// this.stmData.data = [];
let colflg = this.model.cldgrp.rec.colflg;
if (!colflg || colflg == '') {
this.$notify.error({ title: '错误', message: 'Payemnt Disposition必输！' });
......@@ -16,16 +15,13 @@ export default {
}
let rtnmsg = await this.executeRule("butsea")
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
//TODO 处理数据逻辑
this.model.bptbckg.docgrd = rtnmsg.data.ccdbatg;
// this.updateModel(rtnmsg.data);
// this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
//this.model.infbut.dspstm = rtnmsg.data.infbut_dspstm
this.model.bptbck.bptbckg = rtnmsg.data.ccdbatg;
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
console.log(this.model.bptbckg.docgrd);
},
async handleReset() {
// this.model.infcon.seaownref = ""
......
src/model/Cltdav/index.js
......@@ -6,7 +6,9 @@ export default class Cltdav {
this.data = {
cltdavl2blk:"",
cltdavl1blk:"",
bptbckg: [],
bptbck:{
bptbckg:[],
},
liaall: new Pub().data.Liaall,
cldgrp: {
rec: {
......
src/model/Cltset/index.js
......@@ -4,7 +4,9 @@ import Pub from "../Public"
export default class Cltset {
constructor() {
this.data = {
bptbckg:[],
bptbck: {
bptbckg: [], // .bptbck.bptbckg
},
liaall: new Pub().data.Liaall,
cldgrp: {
rec: {
......
src/model/Clttra/index.js
......@@ -4,7 +4,9 @@ import Pub from "../Public"
export default class Clttra {
constructor() {
this.data = {
bptbckg: [],
bptbck:{
bptbckg:[],
},
liaall: new Pub().data.Liaall,
trnmod: new Pub().data.Trnmod,
cldgrp: {
......
src/views/Business/Bctrad/index.vue
......@@ -6,7 +6,7 @@
</c-function-btn>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right"
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 -->
<el-tab-pane label="Additional Docs" name="bctret">
......@@ -114,11 +114,9 @@
}
},
methods: {
tabClick(tab) {
if (this.isInDisplay) {
return
}
const name = tab.name
myTabClick(tab) {
this.tabClick(tab);
let name = tab.name;
let rulePath;
if (name === "setpan") {
rulePath = "setmod.setpan";
......
src/views/Business/Bctset/Bctsus.vue
......@@ -227,7 +227,7 @@
</el-form-item>
</c-col>
<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
>
</c-col>
......@@ -265,7 +265,7 @@
</c-col>
<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
>
</c-col>
......@@ -280,6 +280,7 @@
<c-select
v-model="model.trnmod.cmtflg"
style="width: 100%"
:disabled="model.bcdgrp.rec.focflg=='X'"
placeholder=""
>
<el-option
......@@ -418,15 +419,62 @@ export default {
mounted() {
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: {
...Event,
focflgChange(){
this.executeCheck('bcdgrp.rec.focflg').then((res) => {
if (res.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, res.data)
frepayflgDefault(){
this.executeDefault("trnmod.cmtflg").then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
})
});
},
async crefinflgChange() {
let rtnmsg = await this.executeRule("trtcre.crefinflg");
......@@ -434,12 +482,19 @@ export default {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
async dfflagChange() {
let rtnmsg = await this.executeRule("dftcre.dfflag");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
clsflgOtherDefault(){
this.executeDefault("mtabut.clsflg").then((res) => {
if ((res.respCode == SUCCESS)) {
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) {
console.log(selection);
if (selection.length > 1) {
......
src/views/Business/Bctset/Dftcrep.vue
......@@ -144,7 +144,7 @@
</el-form-item>
</c-col>
<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
v-model="model.dftcre.dfdgrp.rec.invtyp"
style="width: 100%"
......@@ -238,17 +238,26 @@
v-model="model.dftcre.dfdgrp.rec.flttyp"
style="width: 100%"
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-input v-model="model.dftcre.dfdgrp.rec.flttyp"></c-input> -->
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="浮动值" prop="dftcre.dfdgrp.rec.fltval">
<c-col :span="12" style="text-align: right">
<el-form-item label="浮动值" prop="dftcre.dfdgrp.rec.fltval" label-width="110px">
<c-input
:disabled="model.dftcre.dfdgrp.rec.flttyp=='0'||model.dftcre.dfdgrp.rec.flttyp=='3'"
v-model="model.dftcre.dfdgrp.rec.fltval"
placeholder="请输入浮动值"
style="width: 90%"
></c-input>
<span style="width: 10%" v-if="model.dftcre.dfdgrp.rec.flttyp=='2'">%</span>
</el-form-item>
</c-col>
</c-col>
......@@ -288,8 +297,8 @@
</c-col> -->
<c-col :span="24">
<c-col :span="13">
<el-form-item label="代付利息：" prop="dftcre.dfdgrp.rec.rescur">
<!-- <c-col :span="13"> -->
<!-- <el-form-item label="代付利息：" prop="dftcre.dfdgrp.rec.rescur">
<c-select
v-model="model.dftcre.dfdgrp.rec.rescur"
style="width: 100%"
......@@ -298,12 +307,12 @@
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="11">
</c-col> -->
<c-col :span="24">
<el-form-item
label=""
label="代付利息"
prop="dftcre.dfdgrp.rec.resamt"
label-width="5px"
>
<c-input
v-model="model.dftcre.dfdgrp.rec.resamt"
......@@ -422,6 +431,10 @@
v-model="model.dftcre.dfdgrp.dff.pts.ref"
maxlength="16"
placeholder="请输入代付行"
@keyup.enter.native="
showGridPromptDialog('dftcre.dfdgrp.dff.pts.ref')
"
>
></c-input>
</el-form-item>
</c-col>
......@@ -626,9 +639,35 @@ export default {
mixins: [commonProcess],
data() {
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 },
// created:function(){
// this.executeRule("trdgrp.rec.actrat").then((res) => {
......
src/views/Business/Bctset/index.vue
......@@ -56,7 +56,9 @@
<!--PD000000 -->
<el-tab-pane label="Settlement" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="Bookings" name="glepan">
......
src/views/Business/Cltdav/Sel.vue
......@@ -183,14 +183,20 @@ export default {
docgrd: {
columns: [
{
title: "Check Number",
width: "120px",
dataIndex: "chcknum",
show: "text",
},
{
title: "Our Reference",
width: "150px",
width: "120px",
dataIndex: "ownref",
show: "text",
},
{
title: "Description",
width: "200px",
width: "220px",
dataIndex: "nam",
show: "text",
},
......@@ -208,7 +214,7 @@ export default {
},
{
title: "Amount",
width: "200px",
width: "150px",
dataIndex: "amt",
show: "text",
},
......@@ -220,7 +226,7 @@ export default {
},
],
urls: "bptbckg.docgrd",
urls: "bptbck.bptbckg",
},
}
......
src/views/Business/Cltset/Sel.vue
......@@ -122,38 +122,44 @@ export default {
docgrd: {
columns: [
{
title: "Check Number",
width: "120px",
dataIndex: "chcknum",
show: "text",
},
{
title: "Our Reference",
width: "150px",
width: "120px",
dataIndex: "ownref",
show: "text",
},
{
title: "Description",
width: "200px",
width: "240px",
dataIndex: "nam",
show: "text",
},
{
title: "Presenter Name",
width: "200px",
width: "230px",
dataIndex: "prenam",
show: "text",
},
{
title: "cur",
width: "100px",
width: "50px",
dataIndex: "cur",
show: "text",
},
{
title: "Amount",
width: "200px",
width: "100px",
dataIndex: "amt",
show: "text",
},
{
title: "Pay To",
width: "200px",
width: "120px",
dataIndex: "paytoamt",
show: "input",
},
......@@ -165,7 +171,7 @@ export default {
},
],
urls: "bptbckg.docgrd",
urls: "bptbck.bptbckg",
},
}
},
......
src/views/Business/Cltset/index.vue
......@@ -52,7 +52,7 @@
<!-- <el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes" />
</el-tab-pane> -->
<!--PD000546 -->
</c-tabs>
......@@ -84,56 +84,57 @@ import Doctre from "~/views/Public/Doctre";
export default {
name: "Cltset",
components: {
"m-sel": Sel,
"m-setpan": Setpan,
"m-engp": Engp,
"m-glepan": Glepan,
"m-docpan": Docpan,
"m-doctre": Doctre,
"m-coninfp": Coninfp,
"m-ccvpan": Ccvpan,
},
provide() {
return {
root: this
}
},
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "sel",
trnName: "cltset",
model: new Cltset().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: {
...CodeTable,
},
}
},
methods: {
// tabClick() {
// }
},
created: async function () {
console.log("进入cltset交易");
let rtnmsg = await this.init({})
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
this.model.bptbckg.docgrd = rtnmsg.data.ccdbatg;
console.log(this.model.bptbckg.docgrd);
name: "Cltset",
components: {
"m-sel": Sel,
"m-setpan": Setpan,
"m-engp": Engp,
"m-glepan": Glepan,
"m-docpan": Docpan,
"m-doctre": Doctre,
"m-coninfp": Coninfp,
"m-ccvpan": Ccvpan,
},
provide() {
return {
root: this
}
},
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "sel",
trnName: "cltset",
model: new Cltset().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: {
...CodeTable,
},
}
},
methods: {
// tabClick() {
// }
},
created: async function () {
console.log("进入cltset交易");
let rtnmsg = await this.init(this.$route.query)
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
//TODO 处理数据逻辑
this.model.bptbck.bptbckg = rtnmsg.data.ccdbatg;
console.log(this.model.bptbck.bptbckg);
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
}
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
}
}
</script>
<style>
</style>
\ No newline at end of file
src/views/Business/Clttra/Sel.vue
......@@ -67,7 +67,7 @@
<c-col :span="24">
<c-col :span="11">
<el-form-item label="Coll.bank ref." prop="cldgrp.rec.colref">
<c-input v-model="model.cldgrp.rec.colref" maxlength="16" placeholder="请输入Coll.bank ref." disabled>
<c-input v-model="model.cldgrp.rec.colref" maxlength="16" placeholder="请输入Coll.bank ref.">
</c-input>
</el-form-item>
</c-col>
......@@ -124,14 +124,20 @@ export default {
docgrd: {
columns: [
{
title: "Check NUmber",
width: "120px",
dataIndex: "chcknum",
show: "text",
},
{
title: "Our Reference",
width: "150px",
width: "120px",
dataIndex: "ownref",
show: "text",
},
{
title: "Name of CC contact",
width: "200px",
width: "220px",
dataIndex: "nam",
show: "text",
},
......@@ -149,18 +155,18 @@ export default {
},
{
title: "balance",
width: "200px",
width: "100px",
dataIndex: "amt",
show: "text",
},
{
title: "Pay To",
width: "200px",
title: "PAY TO",
width: "100px",
dataIndex: "paytoamt",
show: "input",
},
],
urls: "bptbckg.docgrd",
urls: "bptbck.bptbckg",
},
}
},
......
src/views/Business/Clttra/index.vue
......@@ -113,12 +113,12 @@ export default {
},
created: async function () {
console.log("进入clttra交易");
let rtnmsg = await this.init({})
let rtnmsg = await this.init(this.$route.query)
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
this.model.bptbckg.docgrd = rtnmsg.data.ccdbatg;
console.log(this.model.bptbckg.docgrd);
this.model.bptbck.bptbckg = rtnmsg.data.ccdbatg;
console.log(this.model.bptbck.bptbckg);
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
......
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