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 154 additions and 98 deletions
src/config/CodeTable/index.js
...@@ -6726,8 +6726,8 @@ const CodeTable = { ...@@ -6726,8 +6726,8 @@ const CodeTable = {
// {label:"Issuance of the credit amendment", value:"ISSU"}, // {label:"Issuance of the credit amendment", value:"ISSU"},
// ], // ],
trnchato: [ trnchato: [
{ label: "Applicant", value: "APPL" }, { label: "Applicant Side", value: "APPL" },
{ label: "Beneficiary", value: "BENE" }, { label: "Beneficiary Side", value: "BENE" },
{ label: "Other", value: "OTHR" } { label: "Other", value: "OTHR" }
], ],
bgftktyp: [ bgftktyp: [
...@@ -7027,5 +7027,27 @@ const CodeTable = { ...@@ -7027,5 +7027,27 @@ const CodeTable = {
{label:"TEND",value:"TEND Tender or Bid"}, {label:"TEND",value:"TEND Tender or Bid"},
{label:"WARR",value:"WARR Warrantyimaintenance"}, {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; export default CodeTable;
src/views/Business/Getamc/Conp.vue
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
style="width: 100%" style="width: 100%"
placeholder="请选择Outgoing Purpose" placeholder="请选择Outgoing Purpose"
:code="codes.purpos" :code="codes.purpos"
disabled
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
v-model="model.gidgrp.rec.gartyp" v-model="model.gidgrp.rec.gartyp"
style="width: 100%" style="width: 100%"
placeholder="请选择Type of Undertaking" placeholder="请选择Type of Undertaking"
:code="codes.typgar" :code="codes.typgar1"
disabled disabled
> >
</c-select> </c-select>
...@@ -153,6 +153,7 @@ ...@@ -153,6 +153,7 @@
style="width: 100%" style="width: 100%"
placeholder="请选择Expiry Type" placeholder="请选择Expiry Type"
:code="codes.exptyp" :code="codes.exptyp"
disabled
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
......
src/views/Business/Getamc/Ovwp.vue
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
placeholder="请选择Type of Undertaking" placeholder="请选择Type of Undertaking"
> >
<el-option <el-option
v-for="item in codes.typgar" v-for="item in codes.typgar1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
style="width: 100%" style="width: 100%"
placeholder="请选择Form of Undertaking" placeholder="请选择Form of Undertaking"
disabled disabled
:code="codes.legfrm" :code="codes.legfrm1"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
disabled disabled
> >
<el-option <el-option
v-for="item in codes.gtxinr" v-for="item in codes.gtxinr2"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -453,7 +453,7 @@ ...@@ -453,7 +453,7 @@
v-model="model.gidgrp.rec.orddat" v-model="model.gidgrp.rec.orddat"
style="width: 100%" style="width: 100%"
placeholder="请选择Order Date" placeholder="请选择Order Date"
disabled
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -966,7 +966,7 @@ ...@@ -966,7 +966,7 @@
v-model="model.gidgrp.rec.orddat" v-model="model.gidgrp.rec.orddat"
style="width: 100%" style="width: 100%"
placeholder="请选择Order Date" placeholder="请选择Order Date"
disabled
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
src/views/Business/Getamc/Preperp.vue
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-row> <c-row>
<c-col :span="24"> <c-col :span="24">
<c-col :span="11"> <c-col :span="11">
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item
...@@ -16,7 +15,7 @@ ...@@ -16,7 +15,7 @@
placeholder="请选择Delivery of Undertak." placeholder="请选择Delivery of Undertak."
> >
<el-option <el-option
v-for="item in codes.delori" v-for="item in codes.delori1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -47,6 +46,7 @@ ...@@ -47,6 +46,7 @@
v-model="model.gidgrp.rec.sndto" v-model="model.gidgrp.rec.sndto"
style="width: 100%" style="width: 100%"
placeholder="请选择Undertaking Send to" placeholder="请选择Undertaking Send to"
disabled
> >
<el-option <el-option
v-for="item in codes.rolall" v-for="item in codes.rolall"
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
placeholder="请选择Deliv. To/Collection By" placeholder="请选择Deliv. To/Collection By"
> >
<el-option <el-option
v-for="item in codes.delto" v-for="item in codes.delto1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -87,11 +87,11 @@ ...@@ -87,11 +87,11 @@
> >
<c-input <c-input
:disabled=" :disabled="
model.gidgrp.rec.delto == '' ||
model.gidgrp.rec.delto == 'APPL' || model.gidgrp.rec.delto == 'APPL' ||
model.gidgrp.rec.delto == 'BENE' model.gidgrp.rec.delto == 'BENE'
" "
type="textarea" type="textarea"
:rows="4"
v-model="model.gidgrp.blk.deltoadr" v-model="model.gidgrp.blk.deltoadr"
maxlength="35" maxlength="35"
show-word-limit show-word-limit
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
maxlength="65" maxlength="65"
show-word-limit show-word-limit
placeholder="请输入Transfer Conditions" placeholder="请输入Transfer Conditions"
disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
src/views/Public/Engp.vue
...@@ -4,68 +4,90 @@ ...@@ -4,68 +4,90 @@
Liability Liability
</c-col> --> </c-col> -->
<c-col :span="24" style=""> <c-col :span="24" style="">
<c-table :list="model.liaall.liaallg" style="width:80%,text-align:center,margin-bottom:18px" :border="true"> <c-table
<el-table-column prop="bussec" label="BS" width="40px"> </el-table-column> :list="model.liaall.liaallg"
<el-table-column prop="cbtpfx" label="Type" width="60px"> </el-table-column> style="width:80%,text-align:center,margin-bottom:18px"
<el-table-column prop="matdat" label="Maturity" width="100px"> </el-table-column> :border="true"
<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="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="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="cur" label="Cur" width="55px"> </el-table-column>
<el-table-column prop="oldamt" label="Old Amount" width="150px"> <el-table-column prop="oldamt" label="Old Amount" width="150px">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
{{moneyFormat(scope.row.oldamt)}} {{moneyFormat(scope.row.oldamt)}}
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="amt" label="Booking Amo" width="100px"> <el-table-column prop="amt" label="Booking Amo" width="100px">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
{{moneyFormat(scope.row.amt)}} {{moneyFormat(scope.row.amt)}}
</template> --> </template> -->
</el-table-column>
<el-table-column prop="tenpct" label="%" width="80px">
</el-table-column> </el-table-column>
<el-table-column prop="acc" label="Account" width="150px"> </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="valdat" label="Value Date" width="200px"> <el-table-column prop="valdat" label="Value Date" width="200px">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
{{dateFormat(scope.row.valdat)}} {{dateFormat(scope.row.valdat)}}
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="" prop="det" width="80px" fixed="right"> <el-table-column label="" prop="det" width="80px" fixed="right">
<template slot-scope="scope" slot="header"> <template slot-scope="scope" slot="header">
<el-button <el-button
circle circle
style="padding:4px" style="padding: 4px"
class="el-icon-plus" class="el-icon-plus"
size="mini" size="mini"
@click="addRow(scope)" @click="addRow(scope)"
> >
</el-button> </el-button>
<el-button <el-button
style="padding:4px" style="padding: 4px"
circle circle
class="el-icon-minus" class="el-icon-minus"
size="mini" size="mini"
@click="removeRow(scope)" @click="removeRow(scope)"
> >
</el-button> </el-button>
</template> </template>
<template slot-scope="scoped"> <template slot-scope="scoped">
<el-button <el-button
style="margin-left:0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
@click="detail1(scoped.$index, scoped.row)" @click="detail1(scoped.$index, scoped.row)"
>详情</el-button >详情</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
</c-table> </c-table>
</c-col> </c-col>
<!-- <c-col :span="12"> <!-- <c-col :span="12">
<el-form-item label="Sight Amount"> <el-form-item label="Sight Amount">
<c-input style="width:50%" v-model="model.liaall.outamt" placeholder="请输入Sight Amount"></c-input> <c-input style="width:50%" v-model="model.liaall.outamt" placeholder="请输入Sight Amount"></c-input>
</el-form-item> </el-form-item>
...@@ -82,26 +104,43 @@ ...@@ -82,26 +104,43 @@
<c-input style="width:70%" v-model="model.liaall.concur" maxlength="3" placeholder="请输入External Booking Amount"></c-input> <c-input style="width:70%" v-model="model.liaall.concur" maxlength="3" placeholder="请输入External Booking Amount"></c-input>
</el-form-item> </el-form-item>
</c-col> --> </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"> <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
<c-input style="width:40%" disabled v-model="model.liaall.misamt" placeholder="请输入Amount not yet assigned"></c-input> style="width: 15%"
<c-button style="width:20%" size="small" disabled type="primary" @click="onLiaallButmisamt"> disabled
Add to Current Line v-model="model.liaall.concur"
</c-button> maxlength="3"
</el-form-item> placeholder="请输入External Booking Amount"
</c-col> ></c-input>
<c-input
<!-- <c-col :span="1" style="text-align:left;margin-left:0"> 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>
</c-col>
<!-- <c-col :span="1" style="text-align:left;margin-left:0">
<el-form-item label=""> <el-form-item label="">
<c-button size="small" disabled type="primary" @click="onLiaallButmisamt"> <c-button size="small" disabled type="primary" @click="onLiaallButmisamt">
Add to Current Line Add to Current Line
</c-button> </c-button>
</el-form-item> </el-form-item>
</c-col> --> </c-col> -->
<!-- <c-col :span="12"> <!-- <c-col :span="12">
<el-form-item label=""> <el-form-item label="">
<c-button size="small" type="primary" @click="onLiaallButmissig"> <c-button size="small" type="primary" @click="onLiaallButmissig">
Add to Sight Amount Add to Sight Amount
...@@ -120,39 +159,32 @@ ...@@ -120,39 +159,32 @@
<c-input style="width:50%" v-model="model.liaall.exttotamt" placeholder="请输入Total booking amount external assinged"></c-input> <c-input style="width:50%" v-model="model.liaall.exttotamt" placeholder="请输入Total booking amount external assinged"></c-input>
</el-form-item> </el-form-item>
</c-col> --> </c-col> -->
</div> </div>
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable";
export default { export default {
inject: ['root'], inject: ["root"],
mixins: [commonProcess], mixins: [commonProcess],
props:["model","codes"], props: ["model", "codes"],
data(){ data() {
return { return {};
},
} methods: {
}, async onLiaallButmisamt() {
methods:{ let rtnmsg = await this.executeRule("liaall_butmisamt");
async onLiaallButmisamt() { if (rtnmsg.respCode == SUCCESS) {
let rtnmsg = await this.executeRule("liaall_butmisamt") //TODO 处理数据逻辑
if (rtnmsg.respCode == SUCCESS) { } else {
//TODO 处理数据逻辑 this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
}, },
created:function(){ },
created: function () {},
} };
}
</script> </script>
<style> <style>
</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