Skip to content

V
vue-gjjs
Commit f92ad4bf by nanrui
Options

Merge remote-tracking branch 'origin/development-202206' into development-202206

parents 55127020 b0782f17
Showing with 103 additions and 47 deletions
src/config/CodeTable/index.js
......@@ -6726,8 +6726,8 @@ const CodeTable = {
// {label:"Issuance of the credit amendment", value:"ISSU"},
// ],
trnchato: [
{ label: "Applicant", value: "APPL" },
{ label: "Beneficiary", value: "BENE" },
{ label: "Applicant Side", value: "APPL" },
{ label: "Beneficiary Side", value: "BENE" },
{ label: "Other", value: "OTHR" }
],
bgftktyp: [
......@@ -7027,5 +7027,27 @@ const CodeTable = {
{label:"TEND",value:"TEND Tender or Bid"},
{label:"WARR",value:"WARR Warrantyimaintenance"},
],
legfrm1:[
{label:"Standby letter of credit ",value:"STBY" },
{label:"Uniform Rules for Contract Guarant. URCG",value:"URG" },
{label:"Undertaking (for example guarantee, surely)",value:"UNDK" },
{label:"Uniform Rules for Contract Bonds URCB",value:"URB" },
{label:"OTHER",value:"DEPU" },
{label:"Unit. Nations Convention ind. Guarantees",value:"UNC" },
{label:"Demand guarantee ",value:"DGAR" },
{label:"Guarantee (Standard)",value:"STD" },
{label:"Guarantee (Others)",value:"GUO" },
{label:"Surety Payable On First Demand ",value:"SPDM" },
{label:"Guarantee (ICC758)",value:"758" },
{label:"Guarantee (ICC458)",value:"458" },
{label:"Uniform Customs and Pract.Doc.Cre. UCP",value:"UCP" },
{label:"Standby Letter of Credit (ISP)",value:"ISP" },
],
delto1:[
{label:"Beneficiary",value:"BENE" },
{label:"Specified address",value:"OTHR" },
{label:"Applicant",value:"APPL" },
{label:"Obligor",value:"OBLI" },
],
}
export default CodeTable;
src/views/Business/Getamc/Conp.vue
......@@ -111,7 +111,7 @@
style="width: 100%"
placeholder="请选择Outgoing Purpose"
:code="codes.purpos"
disabled
>
</c-select>
</el-form-item>
......@@ -123,7 +123,7 @@
v-model="model.gidgrp.rec.gartyp"
style="width: 100%"
placeholder="请选择Type of Undertaking"
:code="codes.typgar"
:code="codes.typgar1"
disabled
>
</c-select>
......@@ -153,6 +153,7 @@
style="width: 100%"
placeholder="请选择Expiry Type"
:code="codes.exptyp"
disabled
>
</c-select>
</el-form-item>
......
src/views/Business/Getamc/Ovwp.vue
......@@ -202,7 +202,7 @@
placeholder="请选择Type of Undertaking"
>
<el-option
v-for="item in codes.typgar"
v-for="item in codes.typgar1"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -250,7 +250,7 @@
style="width: 100%"
placeholder="请选择Form of Undertaking"
disabled
:code="codes.legfrm"
:code="codes.legfrm1"
>
</c-select>
</el-form-item>
......@@ -328,7 +328,7 @@
disabled
>
<el-option
v-for="item in codes.gtxinr"
v-for="item in codes.gtxinr2"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -453,7 +453,7 @@
v-model="model.gidgrp.rec.orddat"
style="width: 100%"
placeholder="请选择Order Date"
disabled
></c-date-picker>
</el-form-item>
</c-col>
......@@ -966,7 +966,7 @@
v-model="model.gidgrp.rec.orddat"
style="width: 100%"
placeholder="请选择Order Date"
disabled
></c-date-picker>
</el-form-item>
</c-col>
......
src/views/Business/Getamc/Preperp.vue
......@@ -2,7 +2,6 @@
<div class="eibs-tab">
<c-row>
<c-col :span="24">
<c-col :span="11">
<c-col :span="24">
<el-form-item
......@@ -16,7 +15,7 @@
placeholder="请选择Delivery of Undertak."
>
<el-option
v-for="item in codes.delori"
v-for="item in codes.delori1"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -47,6 +46,7 @@
v-model="model.gidgrp.rec.sndto"
style="width: 100%"
placeholder="请选择Undertaking Send to"
disabled
>
<el-option
v-for="item in codes.rolall"
......@@ -70,7 +70,7 @@
placeholder="请选择Deliv. To/Collection By"
>
<el-option
v-for="item in codes.delto"
v-for="item in codes.delto1"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -87,11 +87,11 @@
>
<c-input
:disabled="
model.gidgrp.rec.delto == '' ||
model.gidgrp.rec.delto == 'APPL' ||
model.gidgrp.rec.delto == 'BENE'
"
type="textarea"
:rows="4"
v-model="model.gidgrp.blk.deltoadr"
maxlength="35"
show-word-limit
......@@ -108,6 +108,7 @@
maxlength="65"
show-word-limit
placeholder="请输入Transfer Conditions"
disabled
></c-input>
</el-form-item>
</c-col>
......
src/views/Public/Engp.vue
......@@ -4,16 +4,37 @@
Liability
</c-col> -->
<c-col :span="24" style="">
<c-table :list="model.liaall.liaallg" style="width:80%,text-align:center,margin-bottom:18px" :border="true">
<el-table-column prop="bussec" label="BS" width="40px"> </el-table-column>
<el-table-column prop="cbtpfx" label="Type" width="60px"> </el-table-column>
<el-table-column prop="matdat" label="Maturity" width="100px"> </el-table-column>
<el-table-column prop="tenday" label="Tenor" width="70px"> </el-table-column>
<el-table-column prop="rol" label="Dbt." width="70px"> </el-table-column>
<c-table
:list="model.liaall.liaallg"
style="width:80%,text-align:center,margin-bottom:18px"
:border="true"
>
<el-table-column prop="bussec" label="BS" width="40px">
</el-table-column>
<el-table-column prop="cbtpfx" label="Type" width="60px">
</el-table-column>
<el-table-column prop="matdat" label="Maturity">
<template slot-scope="scope">
<c-date-picker
type="date"
v-model="scope.row.matdat"
value-format="yyyy-MM-dd"
placeholder="请选择Date"
style="width: 100%"
@change="executeDefault('liaall.liaallg.matdat')"
>
</c-date-picker>
</template>
</el-table-column>
<el-table-column prop="tenday" label="Tenor" width="70px">
</el-table-column>
<el-table-column prop="rol" label="Dbt." width="70px">
</el-table-column>
<!--
<el-table-column prop="nam" label="Name" width="300"> </el-table-column>
-->
<el-table-column prop="cdtrol" label="Cdt." width="70px"> </el-table-column>
<el-table-column prop="cdtrol" label="Cdt." width="70px">
</el-table-column>
<el-table-column prop="cur" label="Cur" width="55px"> </el-table-column>
<el-table-column prop="oldamt" label="Old Amount" width="150px">
<!-- <template slot-scope="scope">
......@@ -27,7 +48,8 @@
</el-table-column>
<el-table-column prop="tenpct" label="%" width="80px">
</el-table-column>
<el-table-column prop="acc" label="Account" width="150px"> </el-table-column>
<el-table-column prop="acc" label="Account" width="150px">
</el-table-column>
<el-table-column prop="valdat" label="Value Date" width="200px">
<!-- <template slot-scope="scope">
{{dateFormat(scope.row.valdat)}}
......@@ -37,14 +59,14 @@
<template slot-scope="scope" slot="header">
<el-button
circle
style="padding:4px"
style="padding: 4px"
class="el-icon-plus"
size="mini"
@click="addRow(scope)"
>
</el-button>
<el-button
style="padding:4px"
style="padding: 4px"
circle
class="el-icon-minus"
size="mini"
......@@ -54,7 +76,7 @@
</template>
<template slot-scope="scoped">
<el-button
style="margin-left:0"
style="margin-left: 0"
size="small"
type="primary"
@click="detail1(scoped.$index, scoped.row)"
......@@ -83,11 +105,28 @@
</el-form-item>
</c-col> -->
<c-col :span="16" style="margin-top:10px">
<c-col :span="16" style="margin-top: 10px">
<el-form-item label="Amount not yet assigned">
<c-input style="width:15%" disabled v-model="model.liaall.concur" maxlength="3" placeholder="请输入External Booking Amount"></c-input>
<c-input style="width:40%" disabled v-model="model.liaall.misamt" placeholder="请输入Amount not yet assigned"></c-input>
<c-button style="width:20%" size="small" disabled type="primary" @click="onLiaallButmisamt">
<c-input
style="width: 15%"
disabled
v-model="model.liaall.concur"
maxlength="3"
placeholder="请输入External Booking Amount"
></c-input>
<c-input
style="width: 40%"
disabled
v-model="model.liaall.misamt"
placeholder="请输入Amount not yet assigned"
></c-input>
<c-button
style="width: 20%"
size="small"
disabled
type="primary"
@click="onLiaallButmisamt"
>
Add to Current Line
</c-button>
</el-form-item>
......@@ -123,36 +162,29 @@
</div>
</template>
<script>
import Api from "~/service/Api"
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import CodeTable from "~/config/CodeTable";
export default {
inject: ['root'],
inject: ["root"],
mixins: [commonProcess],
props:["model","codes"],
data(){
return {
}
props: ["model", "codes"],
data() {
return {};
},
methods:{
methods: {
async onLiaallButmisamt() {
let rtnmsg = await this.executeRule("liaall_butmisamt")
let rtnmsg = await this.executeRule("liaall_butmisamt");
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
} else {
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
},
},
created:function(){
}
}
created: function () {},
};
</script>
<style>
</style>
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