Skip to content

V
vue-gjjs
Commit 21eab8e9 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 ad5f00b1 4d7af495
Showing with 257 additions and 97 deletions
src/config/CodeTable/index.js
......@@ -6449,32 +6449,32 @@ const CodeTable = {
{ label: "X 现收", value: "X" }
],
setglldsp: [
{ label: "贷记暂收款项账", value: "ARC" },
{ label: "借记暂收款项账", value: "ARD" },
{ label: "出口贴现/买入票据账", value: "BDF" },
{ label: "出口押汇账", value: "BEF" },
{ label: "进出口垫款账", value: "BRF" },
{ label: "借记客户保证金账", value: "CCD" },
{ label: "贷记客户保证金账", value: "CCC" },
{ label: "借记清算汇入账", value: "CID" },
{ label: "贷记清算汇出账", value: "COC" },
{ label: "贷记金融股机构存款", value: "FIC" },
{ label: "借记金融机构存款", value: "FID" },
{ label: "利息收入账", value: "INC" },
{ label: "借记客户往来账", value: "LOD" },
{ label: "贷记客户往来账", value: "LOC" },
{ label: "第三方风险参贷账", value: "NFR" },
{ label: "借记存放上级/国外账", value: "NOD" },
{ label: "贷记存放上级/国外账", value: "NOC" },
{ label: "贷记国结专户", value: "SPC" },
{ label: "借记国结专户", value: "SPD" },
{ label: "贷记国际结算临时账", value: "TPC" },
{ label: "借记国际结算临时账", value: "TPD" },
{ label: "信托收据/进口押汇账", value: "TRF" },
{ label: "打包贷款账（已取消）", value: "PCF" },
{ label: "通过Nostro付款", value: "PAC" },
{ label: "贷记其他保证金账", value: "SCC" },
{ label: "国结系统融资过渡账", value: "BF" }
{ label: "ARC 贷记暂收款项账", value: "ARC" },
{ label: "ARD 借记暂收款项账", value: "ARD" },
{ label: "BDF 出口贴现/买入票据账", value: "BDF" },
{ label: "BEF 出口押汇账", value: "BEF" },
{ label: "BRF 进出口垫款账", value: "BRF" },
{ label: "CCD 借记客户保证金账", value: "CCD" },
{ label: "CCC 贷记客户保证金账", value: "CCC" },
{ label: "CID 借记清算汇入账", value: "CID" },
{ label: "COC 贷记清算汇出账", value: "COC" },
{ label: "FIC 贷记金融股机构存款", value: "FIC" },
{ label: "FID 借记金融机构存款", value: "FID" },
{ label: "INC 利息收入账", value: "INC" },
{ label: "LOD 借记客户往来账", value: "LOD" },
{ label: "LOC 贷记客户往来账", value: "LOC" },
{ label: "NFR 第三方风险参贷账", value: "NFR" },
{ label: "NOD 借记存放上级/国外账", value: "NOD" },
{ label: "NOC 贷记存放上级/国外账", value: "NOC" },
{ label: "SPC 贷记国结专户", value: "SPC" },
{ label: "SPD 借记国结专户", value: "SPD" },
{ label: "TPC 贷记国际结算临时账", value: "TPC" },
{ label: "TPD 借记国际结算临时账", value: "TPD" },
{ label: "TRF 信托收据/进口押汇账", value: "TRF" },
{ label: "PCF 打包贷款账（已取消）", value: "PCF" },
{ label: "PAC 通过Nostro付款", value: "PAC" },
{ label: "SCC 贷记其他保证金账", value: "SCC" },
{ label: "BF 国结系统融资过渡账", value: "BF" }
],
setfelRol: [
{ label: "OWN Ourselves", value: "OWN" },
......
src/views/Business/Botame/Ovwp.vue
......@@ -163,7 +163,7 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Shipment date" prop="bodgrp.rec.shpdat">
<el-form-item label="Date of Shipment" prop="bodgrp.rec.shpdat">
<c-date-picker
type="date"
v-model="model.bodgrp.rec.shpdat"
......
src/views/Business/Botame/index.vue
......@@ -168,7 +168,10 @@ export default {
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data)
this.updateModel(rtnmsg.data);
if (this.isInDisplay) {
this.restoreDisplay();
}
}
else
{
......
src/views/Business/Botdav/Ovwp.vue
......@@ -51,7 +51,7 @@
<c-col :span="12">
<el-form-item label="Document Amount" prop="bodgrp.cbs.max.cur">
<c-select v-model="model.bodgrp.cbs.max.cur" style="width: 100%" placeholder="请选择Currency" @change="changeCur">
<el-option v-for="item in codes.currencycode" :key="item.value" :label="item.label" :value="item.value">
<el-option v-for="item in codes.curtxt1" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
......@@ -133,6 +133,9 @@
onkeyup="value=value.replace(/[^\d]/g,' ')" :disabled="model.bodgrp.rec.doctypcod === 'P'"></c-input>
</el-form-item>
</c-col>
<c-col :span="1" style="margin-left:-10px">
<el-form-item label="Days"> </el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Starting from" prop="bodgrp.rec.matperbeg">
......@@ -223,7 +226,7 @@
}" :disabled="false">
</c-ptap>
<c-col :span="24">
<el-form-item label="Country Code Risk Country!" prop="bodgrp.rec.stacty">
<el-form-item label="Country or region Code" prop="bodgrp.rec.stacty">
<c-select v-model="model.bodgrp.rec.stacty" style="width:100%" placeholder="请选择Country Code Risk Country!"
:code="codes.stacty">
</c-select>
......
src/views/Business/Botdcr/Botdcrp1.vue
......@@ -63,22 +63,34 @@
</c-col>
<c-col :span="24">
<el-form-item label="Document Set Status" prop="bodgrp.rec.docsta">
<c-select v-model="model.bodgrp.rec.docsta" maxlength="40" placeholder="请输入Document Set Status" disabled
<c-select v-model="model.bodgrp.rec.docsta" style="width: 100%" placeholder="请输入Document Set Status" disabled
:code="codes.docstabot">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Maturity Date" prop="bodgrp.rec.matdat">
<c-date-picker type="date" v-model="model.bodgrp.rec.matdat" style="width:100%" placeholder="请选择Maturity Date"
disabled></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Tenor Specification" prop="bodgrp.rec.matpercnt">
<c-input v-model="model.bodgrp.rec.matpercnt" placeholder="请输入Tenor Specification" disabled></c-input>
</el-form-item>
</c-col>
<c-col :span="18">
<el-form-item label="Tenor Specification" prop="bodgrp.rec.matdat">
<c-date-picker
type="date"
disabled
v-model="model.bodgrp.rec.matdat"
style="width: 100%"
placeholder="请选择Maturity Date"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="5">
<el-form-item label="" label-width="5px">
<c-input
disabled
v-model="model.bodgrp.rec.matpercnt"
placeholder="请输入Tenor Specification"
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">
<el-form-item label="Days" label-width="5px"> </el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label=" " prop="bodgrp.rec.matperbeg">
<c-select v-model="model.bodgrp.rec.matperbeg" style="width:100%"
......
src/views/Business/Botdcr/Ptyp.vue
......@@ -45,9 +45,10 @@
<c-col :span="24">
<c-table max-height="300px" style="text-align: center;" stripe :list="this.model.botp.ptsaddp.ptsaddg || []"
:paginationShow="false" :border="true">
<el-table-column label="Additional Parties">
<el-table-column label="角色" width="auto" prop="rol">
<template slot-scope="scope">
<c-select v-model="scope.row.rol" :code="codes.ptyp2">
<c-select v-model="scope.row.rol" :code="ptyp2">
</c-select>
</template>
......@@ -89,6 +90,7 @@
</el-button>
</template>
</el-table-column>
</el-table-column>
</c-table>
</c-col>
</c-row>
......@@ -114,6 +116,17 @@ export default {
nam:"",
ref:"",
},
ptyp2: [
{ label: "TP0 Third Party", value: "TP0" },
{ label: "TP1 1st Third Party", value: "TP1" },
{ label: "TP2 2nd Third Party", value: "TP2" },
{ label: "TP3 3rd Third Party", value: "TP3" },
{ label: "TP4 4th Third Party", value: "TP4" },
{ label: "TP5 5th Third Party", value: "TP5" },
{ label: "TP6 6th Third Party", value: "TP6" },
{ label: "TP7 7th Third Party", value: "TP7" },
{ label: "TP8 8th Third Party", value: "TP8" },
],
}
},
methods: {
......
src/views/Business/Botrad/Botrad.vue
......@@ -62,21 +62,33 @@
</c-col>
<c-col :span="24">
<el-form-item label="Document Set Status" prop="bodgrp.rec.docsta">
<c-select v-model="model.bodgrp.rec.docsta" maxlength="40" placeholder="请输入Document Set Status" :code="codes.docstabot" disabled>
<c-select v-model="model.bodgrp.rec.docsta" style="width: 100%" placeholder="请输入Document Set Status" :code="codes.docstabot" disabled>
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Maturity Date" prop="bodgrp.rec.matdat">
<c-date-picker type="date" v-model="model.bodgrp.rec.matdat" style="width:100%" placeholder="请选择Maturity Date"
disabled></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Tenor Specification" prop="bodgrp.rec.matpercnt">
<c-input v-model="model.bodgrp.rec.matpercnt" placeholder="请输入Tenor Specification" disabled></c-input>
</el-form-item>
</c-col>
<c-col :span="18">
<el-form-item label="Tenor Specification" prop="bodgrp.rec.matdat">
<c-date-picker
type="date"
disabled
v-model="model.bodgrp.rec.matdat"
style="width: 100%"
placeholder="请选择Maturity Date"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="5">
<el-form-item label="" label-width="5px">
<c-input
disabled
v-model="model.bodgrp.rec.matpercnt"
placeholder="请输入Tenor Specification"
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">
<el-form-item label="Days" label-width="5px"> </el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label=" " prop="bodgrp.rec.matperbeg">
<c-select v-model="model.bodgrp.rec.matperbeg" style="width:100%" :code="codes.matperbeg"
......
src/views/Business/Botrad/Ptyp.vue
......@@ -27,9 +27,10 @@
<c-col :span="24">
<c-table max-height="300px" style="text-align: center;" stripe :list="this.model.botp.ptsaddp.ptsaddg || []"
:paginationShow="false" :border="true">
<el-table-column label="Additional Parties">
<el-table-column label="角色" width="auto" prop="rol">
<template slot-scope="scope">
<c-select v-model="scope.row.rol" :code="codes.ptyp2">
<c-select v-model="scope.row.rol" :code="ptyp2">
</c-select>
</template>
......@@ -70,6 +71,7 @@
<el-button size="mini" @click="handleEdit(scope.$index, scope.row)" type="primary">详情
</el-button>
</template>
</el-table-column>
</el-table-column>
</c-table>
</c-col>
......@@ -139,6 +141,17 @@
nam:"",
ref:"",
},
ptyp2: [
{ label: "TP0 Third Party", value: "TP0" },
{ label: "TP1 1st Third Party", value: "TP1" },
{ label: "TP2 2nd Third Party", value: "TP2" },
{ label: "TP3 3rd Third Party", value: "TP3" },
{ label: "TP4 4th Third Party", value: "TP4" },
{ label: "TP5 5th Third Party", value: "TP5" },
{ label: "TP6 6th Third Party", value: "TP6" },
{ label: "TP7 7th Third Party", value: "TP7" },
{ label: "TP8 8th Third Party", value: "TP8" },
],
}
},
methods: {
......
src/views/Business/Botset/Basp3.vue
......@@ -158,7 +158,7 @@
<c-col :span="14">
<el-form-item label="" prop="bopmod.dbagrp.bas.outchargeamt" label-width="5px">
<c-input disabled v-model="model.bopmod.dbagrp.bas.outchargeamt" placeholder="请输入国外银行扣费"></c-input>
<c-input disabled @change="change" v-model="model.bopmod.dbagrp.bas.outchargeamt" placeholder="请输入国外银行扣费"></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -305,7 +305,13 @@ export default {
},
},
},
methods:{},
methods:{
async change() {
if(this.model.bopmod.szflg=="1"){
this.model.bopmod.dbagrp.bas.outchargeamt=this.model.bopmod.outchargeamt
}
}
},
created:function(){
}
......
src/views/Business/Botset/Setp.vue
......@@ -323,20 +323,18 @@
label-width="5px"
prop="setmod.redamt"
>
<c-input-currency
<c-input
:disabled="model.bodgrp.rec.focflg == 'X'"
v-model="model.setmod.redamt"
style="text-align: left; width: 100%"
placeholder="请输入Reduction Amt"
@keyup.enter.native="
defaultFunction('setmod.redamt', model.setmod.redamt)
"
></c-input-currency>
@keyup.enter.native="showGridPromptDialog('setmod.redamt')"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-checkbox
:disabled="model.setmod.docamt <= model.bodgrp.cbs.opn1.amt"
:disabled="model.setmod.docamt < model.bodgrp.cbs.opn1.amt"
v-model="model.mtabut.clsflg"
>Close Contract</c-checkbox
>
......@@ -366,14 +364,13 @@
label-width="5px"
prop="setmod.docamt"
>
<c-input-currency
<c-input
v-model="model.setmod.docamt"
style="text-align: left; width: 100%"
placeholder="请输入Settle Amt."
@keyup.enter.native="
defaultFunction('setmod.docamt', model.setmod.docamt)
"
></c-input-currency>
@change="change1"
@keyup.enter.native="showGridPromptDialog('setmod.docamt')"
></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -438,10 +435,10 @@ export default {
computed: {
clsflg: {
get() {
return this.model.mtabut.clsflg === "O";
return this.model.mtabut.clsflg === "X";
},
set(val) {
this.model.mtabut.clsflg = val ? "C" : "O";
this.model.mtabut.clsflg = val ? "x" : "";
},
},
focflg: {
......@@ -460,17 +457,28 @@ export default {
this.$nextTick(() => {});
},
// watch:{
// "model.setmod.docamt":function(){
// if(this.model.bodgrp.cbs.opn1.amt==this.model.setmod.docamt){
// this.model.mtabut.clsflg = "X";
// }
// },
// },
methods: {
...Event,
async change1(){
if(this.model.bodgrp.cbs.opn1.amt==this.model.setmod.docamt){
this.model.mtabut.clsflg = "X";
}},
async change() {
if (this.model.bodgrp.rec.focflg === "X") {
this.model.setmod.redamt = this.model.setmod.docamt;
let rtnmsg = await this.executeDefault("setmod.redamt");
this.model.bodgrp.rec.docsta ="D"
// let rtnmsg = await this.executeDefault("setmod.redamt");
// this.model.bodgrp.rec.docsta ="D"
} else {
this.model.setmod.redamt = "0.00";
let rtnmsg = await this.executeDefault("setmod.redamt");
this.model.bodgrp.rec.docsta = rtnmsg.data.bodgrp_rec_docsta;
// let rtnmsg = await this.executeDefault("setmod.redamt");
// this.model.bodgrp.rec.docsta = rtnmsg.data.bodgrp_rec_docsta;
}
},
async multipleSelect(selection) {
......
src/views/Business/Botset/Wg.vue
......@@ -6,7 +6,7 @@
<c-fullbox>
<el-form-item label="申报类型" prop="bopmod.szflg">
<c-select
@change="change"
@change="selectOrCheckboxRule('bopmod.szflg')"
v-model="model.bopmod.szflg"
style="width: 100%"
placeholder="请选择申报类型"
......@@ -173,13 +173,14 @@ export default {
};
},
methods: { ...Event,
async change() {
if(this.model.bopmod.szflg=="3" || this.model.bopmod.szflg==""){
this.model.lendoc.actflg=""
this.model.bopmod.ownextkey=""
watch:{
"model.bopmod.szflg":function(){
if(this.model.bopmod.szflg=="3" || this.model.bopmod.szflg==""){
this.model.lendoc.actflg=""
}
},
},
},
methods: { ...Event,
},
created: function () {},
};
......
src/views/Business/Botset/index.vue
......@@ -208,14 +208,12 @@ export default {
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data)
this.$nextTick(() => {
this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;
})
}
else
{
this.updateModel(rtnmsg.data);
if (this.isInDisplay) {
this.restoreDisplay();
}
this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
}else{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
}
......
src/views/Public/Ccvpan.vue
......@@ -7,6 +7,7 @@
</el-form-item>
</c-col>
-->
<c-col :span="24">
<c-col :span="12">
<el-form-item label="合同金额" prop="liaall.liaccv.concur">
<c-row>
......@@ -62,6 +63,7 @@
</c-row>
</el-form-item>
</c-col>
</c-col>
<!--
<c-col :span="12">
......@@ -70,6 +72,7 @@
</el-form-item>
</c-col>
-->
<c-col :span="24">
<c-col :span="12">
<el-form-item label="Reserved Amount" prop="liaall.liaccv.newresamt">
<c-row>
......@@ -123,6 +126,7 @@
</c-row>
</el-form-item>
</c-col>
</c-col>
<!--
<c-col :span="12">
......@@ -291,16 +295,36 @@
</c-col> -->
<c-col :span="12" style="margin-top:15px">
<c-col :span="24">
<el-form-item label="金额总和">
<!-- <c-col :span="8"> -->
<c-input
style="width: 100%"
v-model="model.liaall.liaccv.totcovamt"
placeholder="请输入金额总和"
></c-input>
<!-- </c-col> -->
<c-row>
<c-col :span="8">
<c-select
v-model="model.liaall.liaccv.concur"
disabled
style="width: 95%"
placeholder="请选择Type of settlement"
>
<el-option
v-for="item in codes.curtxt"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</c-col>
<c-col :span="16">
<c-input
v-model="model.liaall.liaccv.totcovamt"
:readonly="true"
></c-input>
</c-col>
</c-row>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Additional Information "
v-if="model.liaall.liaccv.addinf!=''">
<c-input
......@@ -312,6 +336,7 @@
placeholder="请输入Additional Information "
></c-input>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12">
......
src/views/Review/Business/ReviewBotame.vue 0 → 100644
<template>
<ReviewWrapper>
<Botame></Botame>
</ReviewWrapper>
</template>
<script>
import Botame from "~/views/Business/Botame";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewBotame",
components: { ReviewWrapper, Botame },
created() {},
mounted() {},
};
</script>
<style></style>
\ No newline at end of file
src/views/Review/Business/ReviewBotcan.vue 0 → 100644
<template>
<ReviewWrapper>
<Botcan></Botcan>
</ReviewWrapper>
</template>
<script>
import Botcan from "~/views/Business/Botcan";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewBotcan",
components: { ReviewWrapper, Botcan },
created() {},
mounted() {},
};
</script>
<style></style>
\ No newline at end of file
src/views/Review/Business/ReviewBotset.vue 0 → 100644
<template>
<ReviewWrapper>
<Botset></Botset>
</ReviewWrapper>
</template>
<script>
import Botset from "~/views/Business/Botset";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewBotset",
components: { ReviewWrapper, Botset },
created() {},
mounted() {},
};
</script>
<style></style>
\ No newline at end of file
src/views/Review/ReviewRouter.js
......@@ -44,6 +44,9 @@ import ReviewBetdcr from "./Business/ReviewBetdcr.vue";
import ReviewLitdav from "./Business/ReviewLitdav.vue";
import ReviewBotacc from "./Business/ReviewBotacc.vue";
import ReviewBotpay from "./Business/ReviewBotpay.vue";
import ReviewBotame from "./Business/ReviewBotame.vue";
import ReviewBotset from "./Business/ReviewBotset.vue";
import ReviewBotcan from "./Business/ReviewBotcan.vue";
const ReviewRouter = [
......@@ -107,6 +110,9 @@ const ReviewRouter = [
{ path: "litdav", component: ReviewLitdav, name: "ReviewLitdav", meta: { title: "复核-Litdav" } },
{ path: "botacc", component: ReviewBotacc, name: "ReviewBotacc", meta: { title: "复核-Botacc" } },
{ path: "botpay", component: ReviewBotpay, name: "ReviewBotpay", meta: { title: "复核-Botpay" } },
{ path: "botame", component: ReviewBotame, name: "ReviewBotame", meta: { title: "复核-Botame" } },
{ path: "botset", component: ReviewBotset, name: "ReviewBotset", meta: { title: "复核-Botset" } },
{ path: "botcan", component: ReviewBotcan, name: "ReviewBotcan", meta: { title: "复核-Botcan" } },
];
......
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