Commit ce3590de by SunJie
parents a9544dbb 6d55d388
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
{ {
params = params||{} params = params||{}
let data = Utils.flatObject(this.model) let data = Utils.flatObject(this.model)
return Api.post(this.declareParams.trnName+"/default/"+rulePath,{...data,params}) return Api.post(this.declareParams.trnName+"/executeDefault/"+rulePath,{...data,params})
}, },
executeRule(rulePath,params) executeRule(rulePath,params)
{ {
......
...@@ -282,19 +282,32 @@ export default { ...@@ -282,19 +282,32 @@ export default {
} }
}) })
}, },
onLiaccvAdd() { async onLiaccvAdd() {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => { // this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid) // if (!valid)
return; // return;
let rtnmsg = await Api.post("ditopn/liaccv_add", Utils.flatObject(this.model)) // let rtnmsg = await Api.post("ditopn/liaccv_add", Utils.flatObject(this.model))
if (rtnmsg.respCode == "AAAAAA") { // if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑 // //TODO 处理数据逻辑
} // }
else { // else {
this.$notify.error({ title: '错误', message: '服务请求失败!' }); // this.$notify.error({ title: '错误', message: '服务请求失败!' });
} // }
}) // })
let rtnmsg = await Api.post("ditopn/executeRule/liaall.liaccv.add", Utils.flatObject(this.model))
//const that = this.$parent.$parent.$parent.$parent;
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
this.stmData.data = rtnmsg.data.stgStm.rows;
this.dialogTableVisible = true;
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
}, },
onLiaccvDel() { onLiaccvDel() {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => { this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
...@@ -390,21 +403,21 @@ export default { ...@@ -390,21 +403,21 @@ export default {
} }
}, },
async BlurBennam(e){ async BlurBennam(e){
let rtnmsg = await Api.post("ditopn/default/ditp.remark", Utils.flatObject(this.model)) let rtnmsg = await Api.post("ditopn/executeDefault/ditp.remark", Utils.flatObject(this.model))
if (rtnmsg.respCode == "AAAAAA") { if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.model.ditp.remark = rtnmsg.data.ditp_remark this.model.ditp.remark = rtnmsg.data.ditp_remark
} }
}, },
async BlurAplname(e){ async BlurAplname(e){
let rtnmsg = await Api.post("ditopn/default/ditp.remark", Utils.flatObject(this.model)) let rtnmsg = await Api.post("ditopn/executeDefault/ditp.remark", Utils.flatObject(this.model))
if (rtnmsg.respCode == "AAAAAA") { if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.model.ditp.remark = rtnmsg.data.ditp_remark this.model.ditp.remark = rtnmsg.data.ditp_remark
} }
}, },
async BlurSignam(e){ async BlurSignam(e){
let rtnmsg = await Api.post("ditopn/default/ditp.remark", Utils.flatObject(this.model)) let rtnmsg = await Api.post("ditopn/executeDefault/ditp.remark", Utils.flatObject(this.model))
if (rtnmsg.respCode == "AAAAAA") { if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.model.ditp.remark = rtnmsg.data.ditp_remark this.model.ditp.remark = rtnmsg.data.ditp_remark
...@@ -412,5 +425,15 @@ export default { ...@@ -412,5 +425,15 @@ export default {
}, },
async onExtkey(e){ async onExtkey(e){
},
async pickDepItem(row){
var params = {'selsptinr':row[0]};
//{params:{'selsptinr':row[0]}}
let rtnmsg = await Api.post("ditopn/executeRule/liaall.liaccv.add",{...Utils.flatObject(this.model),params})
if (rtnmsg.respCode == "AAAAAA") {
this.dialogTableVisible = false;
Utils.copyValueFromVO(this.model,rtnmsg.data);
}
} }
} }
\ No newline at end of file
...@@ -195,7 +195,8 @@ export default class Ditopn{ ...@@ -195,7 +195,8 @@ export default class Ditopn{
outpct:"", // Sight Amount Percentage .liaall.outpct outpct:"", // Sight Amount Percentage .liaall.outpct
outamt:"", // Sight Amount .liaall.outamt outamt:"", // Sight Amount .liaall.outamt
exttotoldamt:"", // Old Amount booked externally .liaall.exttotoldamt exttotoldamt:"", // Old Amount booked externally .liaall.exttotoldamt
exttotamt:"", // Total booking amount external assinged .liaall.exttotamt exttotamt:"",
liaallg:[], // Total booking amount external assinged .liaall.exttotamt
limmod:{ limmod:{
limpts:{ limpts:{
wrklab:"", // Label .liaall.limmod.limpts.wrklab wrklab:"", // Label .liaall.limmod.limpts.wrklab
...@@ -245,6 +246,7 @@ export default class Ditopn{ ...@@ -245,6 +246,7 @@ export default class Ditopn{
gleflg:"", // Create gle flag .liaall.liaccv.gleflg gleflg:"", // Create gle flag .liaall.liaccv.gleflg
chgcurflg:"", // Change currency flag .liaall.liaccv.chgcurflg chgcurflg:"", // Change currency flag .liaall.liaccv.chgcurflg
pctresamt:"", // reserve amount based percent .liaall.liaccv.pctresamt pctresamt:"", // reserve amount based percent .liaall.liaccv.pctresamt
liaccvg:[],
}, },
}, },
litameadv:"", // 特殊规定 .litameadv litameadv:"", // 特殊规定 .litameadv
......
...@@ -76,12 +76,12 @@ export default { ...@@ -76,12 +76,12 @@ export default {
}, },
async continueEdit(row){ async continueEdit(row){
let rtnmsg = await Api.post("sptsel/getPendingData",{params:{'selsptinr':row[0]}}) //let rtnmsg = await Api.post("sptsel/getPendingData",{params:{'selsptinr':row[0]}})
if (rtnmsg.respCode == "AAAAAA") { //if (rtnmsg.respCode == "AAAAAA") {
var cacheFileName = rtnmsg.data.cacheFileName; //var cacheFileName = rtnmsg.data.cacheFileName;
let viewurl ="/business/ditopn?cacheFileName="+cacheFileName; let viewurl ="/business/ditopn?selsptinr="+row[0];
this.$router.push(viewurl); this.$router.push(viewurl);
} //}
} }
} }
\ No newline at end of file
...@@ -39,9 +39,28 @@ export function dateFormat (date, format) { ...@@ -39,9 +39,28 @@ export function dateFormat (date, format) {
return _format; return _format;
} }
// 数字展示成金额
export function moneyFormat(value, precision = 2) {
//0
let num = value
if (num == 0) {
return num.toLocaleString();
}
if (num) {
num = typeof num == 'string' ? parseFloat(num) : num
num = num.toFixed(precision);
num = parseFloat(num);
num = num.toLocaleString();
return num;
} else {
return num = null;
}
}
export default { export default {
install(Vue){ install(Vue){
Vue.prototype.findCodeLabel = findCodeLabel Vue.prototype.findCodeLabel = findCodeLabel
Vue.prototype.dateFormat = dateFormat Vue.prototype.dateFormat = dateFormat
Vue.prototype.moneyFormat = moneyFormat
} }
} }
...@@ -149,22 +149,20 @@ export default { ...@@ -149,22 +149,20 @@ export default {
this.model.didgrp.blk.defdet = ""; this.model.didgrp.blk.defdet = "";
} }
const arg = Utils.flatObject(this.model); const arg = Utils.flatObject(this.model);
Api.post("ditopn/default/didgrp.rec.avbby", arg).then( Api.post("ditopn/executeDefault/didgrp.rec.avbby", arg).then(
(res) => { (res) => {
if (res.respCode = "AAAAAA"){ if (res.respCode = "AAAAAA"){
const data = res.data; Utils.copyValueFromVO(this.model, res.data);
this.model.didgrp.blk.defdet = data.didgrp_blk_defdet;
} }
} }
); );
}, },
recTenmaxdayEvent(){ recTenmaxdayEvent(){
const arg = Utils.flatObject(this.model); const arg = Utils.flatObject(this.model);
Api.post("ditopn/default/didgrp.rec.tenmaxday", arg).then( Api.post("ditopn/executeDefault/didgrp.rec.tenmaxday", arg).then(
(res) => { (res) => {
if (res.respCode = "AAAAAA"){ if (res.respCode = "AAAAAA"){
const data = res.data; Utils.copyValueFromVO(this.model, res.data);
this.model.didgrp.blk.defdet = data.didgrp_blk_defdet;
} }
} }
); );
......
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<el-col :span="12"> Liability
<el-form-item label="合同金额"> <el-col :span="24">
<el-row> <c-table :list="model.liaall.liaallg" style="width:80%,text-align:center">
<el-col :span="8"> <el-table-column prop="cbtpfx" label="Type" width="auto"> </el-table-column>
<c-input type="text" :disable="true" value="CNY"></c-input> <el-table-column prop="matdat" label="Maturity" width="auto"> </el-table-column>
</el-col> <el-table-column prop="tenday" label="Tenor" width="auto"> </el-table-column>
<el-col :span="14"> <el-table-column prop="rol" label="Dbt." width="auto"> </el-table-column>
<c-input v-model="model.liaall.outamt" default="0.00"></c-input> <el-table-column prop="nam" label="Name" width="auto"> </el-table-column>
</el-col> <el-table-column prop="cdtrol" label="Cdt." width="auto"> </el-table-column>
</el-row> <el-table-column prop="cur" label="Cur" width="auto"> </el-table-column>
</el-form-item> <el-table-column prop="oldamt" label="Old Amount" width="auto">
</el-col> <template slot-scope="scope">
{{moneyFormat(scope.row.oldamt)}}
<el-col :span="12"> </template>
<el-form-item label="保证金应收比例"> </el-table-column>
<el-row> <el-table-column prop="amt" label="Booking Amo" width="auto">
<el-col :span="8"> <template slot-scope="scope">
<c-input v-model="model.liaall.outpct"></c-input> {{moneyFormat(scope.row.amt)}}
</el-col> </template>
<el-col :span="12" style="margin-left:20px"> </el-table-column>
<el-text>%</el-text> <el-table-column prop="tenpct" label="%" width="auto"> </el-table-column>
</el-col> <el-table-column prop="acc" label="Account" width="auto"> </el-table-column>
</el-row> <el-table-column prop="valdat" label="Value Date" width="auto">
</el-form-item> <template slot-scope="scope">
</el-col> {{dateFormat(scope.row.valdat)}}
</template>
<el-col :span="12"> </el-table-column>
<el-form-item label="Reserved Amount"> </c-table>
<el-row> </el-col>
<el-col :span="8">
<c-input type="text" :disable="true" value="CNY"></c-input>
</el-col>
<el-col :span="14">
<c-input v-model="model.liaall.concur"></c-input>
</el-col>
</el-row>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="保证金实收比例">
<el-row>
<el-col :span="8">
<c-input v-model="model.liaall.misamt"></c-input>
</el-col>
<el-col :span="12" style="margin-left:20px">
<el-text>%</el-text>
</el-col>
</el-row>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="应付保证金金额">
<el-row>
<el-col :span="8">
<c-input type="text" :disable="true" value="CNY"></c-input>
</el-col>
<el-col :span="14">
<c-input v-model="model.liaall.exttotamt"></c-input>
</el-col>
</el-row>
</el-form-item>
</el-col>
<!--
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Sight Amount"> <el-form-item label="Sight Amount">
<c-input v-model="model.liaall.outamt" placeholder="请输入Sight Amount"></c-input> <c-input v-model="model.liaall.outamt" placeholder="请输入Sight Amount"></c-input>
...@@ -87,98 +52,31 @@ ...@@ -87,98 +52,31 @@
<el-form-item label="Amount not yet assigned"> <el-form-item label="Amount not yet assigned">
<c-input v-model="model.liaall.misamt" placeholder="请输入Amount not yet assigned"></c-input> <c-input v-model="model.liaall.misamt" placeholder="请输入Amount not yet assigned"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<c-button size="small" type="primary" @click="onLiaallButmisamt">
Add to Current Line
</c-button>
</el-col>
<el-col :span="12">
<c-button size="small" type="primary" @click="onLiaallButmissig">
Add to Sight Amount
</c-button>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Old Amount booked externally"> <el-form-item label="Old Amount booked externally">
<c-input v-model="model.liaall.exttotoldamt" placeholder="请输入Old Amount booked externally"></c-input> <c-input v-model="model.liaall.exttotoldamt" placeholder="请输入Old Amount booked externally"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Total booking amount external assinged"> <el-form-item label="Total booking amount external assinged">
<c-input v-model="model.liaall.exttotamt" placeholder="请输入Total booking amount external assinged"></c-input> <c-input v-model="model.liaall.exttotamt" placeholder="请输入Total booking amount external assinged"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
-->
<el-col :span="24">
<el-row>
<el-col :span="2">
<c-button size="small" type="primary" @click="onLiaallButmisamt">
Add
</c-button>
</el-col>
<el-col :span="2">
<c-button size="small" type="primary" @click="onLiaallButmissig">
Del
</c-button>
</el-col>
</el-row>
</el-col>
<el-col :span="24">
<c-table style="width:80%,text-align:center">
<el-table-column
label="CFO"
width=50
>
</el-table-column>
<el-table-column
label="保证金编号"
width=50
>
</el-table-column>
<el-table-column
label="货币"
width=50
>
</el-table-column>
<el-table-column
label="余额"
width=50
>
</el-table-column>
<el-table-column
label="变动金额"
width=50
>
</el-table-column>
<el-table-column
label="保证金账号"
width=50
>
</el-table-column>
<el-table-column
label="汇率"
width=50
>
</el-table-column>
<el-table-column
label=""
width=50
>
</el-table-column>
<el-table-column
label="折算后金额"
width=50
>
</el-table-column>
</c-table>
</el-col>
<el-col :span="12">
<el-form-item label="金额总和">
<el-row>
<el-col :span="8">
<c-input type="text" :disable="true" value="CNY"></c-input>
</el-col>
<el-col :span="14">
<c-input ></c-input>
</el-col>
</el-row>
</el-form-item>
</el-col>
</div> </div>
</template> </template>
<script> <script>
......
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
v-model="model.didgrp.cbs.nom1.cur" v-model="model.didgrp.cbs.nom1.cur"
style="width: 100%" style="width: 100%"
placeholder="请选择Currency" placeholder="请选择Currency"
@keyup.enter.native="nom1CurEvent"
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.cur"
...@@ -674,6 +675,7 @@ ...@@ -674,6 +675,7 @@
maxlength="35" maxlength="35"
show-word-limit show-word-limit
placeholder="请输入联行名称 电证用" placeholder="请输入联行名称 电证用"
:disabled="this.jigomcFlag"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -701,6 +703,7 @@ export default { ...@@ -701,6 +703,7 @@ export default {
uri: "/ditopn/getElcsRef", uri: "/ditopn/getElcsRef",
}, },
flag: true, flag: true,
jigomcFlag:false,
trade: "", trade: "",
}; };
}, },
...@@ -713,13 +716,7 @@ export default { ...@@ -713,13 +716,7 @@ export default {
if (res.respCode = "AAAAAA"){ if (res.respCode = "AAAAAA"){
//失去焦点,避免多次触发 //失去焦点,避免多次触发
document.getElementById('extkey').blur(); document.getElementById('extkey').blur();
const data = res.data; Utils.copyValueFromVO(this.model, res.data);
this.model.didgrp.apl.namelc = data.didgrp_apl_namelc;
this.model.didgrp.apl.adrelc = data.didgrp_apl_adrelc;
this.model.didgrp.apl.pts.extkey = data.didgrp_apl_pts_extkey;
this.model.didgrp.apl.rolsetflg = data.didgrp_apl_rolsetflg;
this.model.didgrp.rec.nam = data.didgrp_rec_nam; //摘要
this.model.didgrp.apl.pts.extact = data.didgrp_apl_pts_extact; //申请人账号
this.flag = false; this.flag = false;
} }
} }
...@@ -729,13 +726,9 @@ export default { ...@@ -729,13 +726,9 @@ export default {
const data = Utils.flatObject(this.model); const data = Utils.flatObject(this.model);
Api.post("ditopn/executeRule/didgrp.ben.pts.extkey", data).then( Api.post("ditopn/executeRule/didgrp.ben.pts.extkey", data).then(
(res) => { (res) => {
if (res.respCode = "AAAAAA"){ if (res.respCode = "AAAAAA"){
const data = res.data; Utils.copyValueFromVO(this.model, res.data);
this.model.didgrp.ben.namelc = data.didgrp_ben_namelc; }
this.model.didgrp.ben.adrelc = data.didgrp_ben_adrelc;
this.model.didgrp.ben.pts.extkey = data.didgrp_ben_pts_extkey;
}
} }
); );
}, },
...@@ -745,7 +738,6 @@ export default { ...@@ -745,7 +738,6 @@ export default {
if (temp.length < 6){ if (temp.length < 6){
return; return;
} }
// 011451000006
Api.post("ditopn/executeRule/didgrp.beb.pts.bankno", data).then( Api.post("ditopn/executeRule/didgrp.beb.pts.bankno", data).then(
(res) => { (res) => {
if (res.respCode = "AAAAAA"){ if (res.respCode = "AAAAAA"){
...@@ -756,9 +748,8 @@ export default { ...@@ -756,9 +748,8 @@ export default {
type: 'error' type: 'error'
}); });
}else{ }else{
const data = res.data; this.jigomcFlag = true;
this.model.didgrp.beb.pts.bankno = data.didgrp_beb_pts_bankno; Utils.copyValueFromVO(this.model, res.data);
this.model.didgrp.beb.pts.jigomc = data.didgrp_beb_pts_jigomc;
} }
} }
} }
...@@ -774,6 +765,17 @@ export default { ...@@ -774,6 +765,17 @@ export default {
this.model.didgrp.rec.shppro = ""; this.model.didgrp.rec.shppro = "";
} }
}, },
nom1CurEvent(){
const data = Utils.flatObject(this.model);
Api.post("ditopn/executeDefault/didgrp.cbs.nom1.cur", data).then(
(res) => {
if (res.respCode = "AAAAAA"){
Utils.copyValueFromVO(this.model, res.data);
this.flag = false;
}
}
);
},
}, },
created: function () {}, created: function () {},
watch: { watch: {
......
<template>
<el-dialog title="可用保证金条目" :visible.sync="dialogTableVisible">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :showSelection="true" v-on:multipleSelect="multipleSelect">
</c-istream-table>
</el-dialog>
</template>
<script>
export default {
data() {
return {
dialogTableVisible: false,
stmData: {
columns: [
"10 1 \"TRN\" 50 1 tdViewTypeEdit:0 3 ATPTXT",
"11 2:1 \"Own Reference\" 112",
"17 2:2 \"Addtional Text\" 112",
"12 3 \"Cur\" 37",
"13 4 \"Relevant Amount\" 101 2 8:1 2 5",
"14 5 \"Entry\" 104 20 DateTime 1",
"9 6:1 \"Req\" 39",
"2 6:2 \"Sig\" 35",
"6 8:1 \"Rq0\" 40",
"3 8:2 \"Rel0\" 40",
"7 9:1 \"Rq1\" 40",
"4 9:2 \"Rel1\" 40",
"8 10:1 \"Rq2\" 40",
"5 10:2 \"Rel2\" 40",
"15 13 \"Branch\" 142",
"16 11:1 \"User\" 62",
"18 11:2 \"\" 62",
"0 12 \"Status\" 54 1 tdViewTypeEdit:0 1 RELSTA",
],
data: [
]
},
relrowDisabled: true,
multipleSelection: []
};
},
methods: {
closeMask() {
this.dialogTableVisible = true;
},
},
};
</script>
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
<!--PD000342 --> <!--PD000342 -->
<m-tk :model="model" :codes="codes"/> <m-tk :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!-- document rules <!-- document rules
<el-tab-pane label="经办夹查询"> <el-tab-pane label="经办夹查询">
...@@ -52,12 +53,13 @@ ...@@ -52,12 +53,13 @@
<m-setpan :model="model" :codes="codes"/> <m-setpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000027
<el-tab-pane label="保证金"> <el-tab-pane label="或有">
<!--PD000027 -->
<m-engp :model="model" :codes="codes"/> <m-engp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
-->
<el-tab-pane label="保证金"> <el-tab-pane label="保证金">
<m-ccvpan :model="model" :codes="codes"/> <m-ccvpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
...@@ -156,17 +158,16 @@ export default { ...@@ -156,17 +158,16 @@ export default {
}, },
methods:{ methods:{
tabClick(vm){ tabClick(vm){
// this.$refs.modelForm.validate(valid => {
// if (valid){
// console.log(1)
// }else{
// console.log(0)
// }
// })
if(this.isInDisplay){ if(this.isInDisplay){
return return
} }
const label = vm.label const label = vm.label
if (label === "或有") {
this.executeRule("liaall.engp").then(res => {
const data = res.data;
Utils.copyValueFromVO(this.model, data)
})
}
if (label === "帐务") { if (label === "帐务") {
this.executeRule("setmod.setpan").then(res => { this.executeRule("setmod.setpan").then(res => {
if (res.respCode == "AAAAAA"){ if (res.respCode == "AAAAAA"){
...@@ -176,7 +177,6 @@ export default { ...@@ -176,7 +177,6 @@ export default {
}) })
} }
if (label === "面函") { if (label === "面函") {
//didgrp.adv.pts.extkey
this.executeRule("trnmod.trndoc.docpan").then(res => { this.executeRule("trnmod.trndoc.docpan").then(res => {
if (res.respCode == "AAAAAA"){ if (res.respCode == "AAAAAA"){
const data = res.data; const data = res.data;
...@@ -192,12 +192,19 @@ export default { ...@@ -192,12 +192,19 @@ export default {
} }
}) })
} }
if (label === "统一授信") {
this.executeRule("liaall.limmod.limitbody").then(res => {
if (res.respCode == "AAAAAA"){
const data = res.data;
Utils.copyValueFromVO(this.model, data)
}
})
}
} }
}, },
mounted:async function(){ mounted:async function(){
console.log("进入ditopn交易"); console.log("进入ditopn交易");
let rtnmsg = await this.init(this.$route.query) let rtnmsg = await this.init(this.$route.query)
// let rtnmsg = {respCode: ''}
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
//更新数据 //更新数据
......
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