Skip to content

V
vue-gjjs
Commit ce3590de by SunJie
Options

Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

parents a9544dbb 6d55d388
Showing with 208 additions and 206 deletions
src/mixin/commonApi.js
......@@ -27,7 +27,7 @@ export default {
{
params = params||{}
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)
{
......
src/model/Ditopn/Event.js
......@@ -282,19 +282,32 @@ export default {
}
})
},
onLiaccvAdd() {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid)
return;
let rtnmsg = await Api.post("ditopn/liaccv_add", Utils.flatObject(this.model))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
async onLiaccvAdd() {
// this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
// if (!valid)
// return;
// let rtnmsg = await Api.post("ditopn/liaccv_add", Utils.flatObject(this.model))
// if (rtnmsg.respCode == "AAAAAA") {
// //TODO 处理数据逻辑
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
})
// }
// else {
// 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() {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
......@@ -390,21 +403,21 @@ export default {
}
},
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") {
//TODO 处理数据逻辑
this.model.ditp.remark = rtnmsg.data.ditp_remark
}
},
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") {
//TODO 处理数据逻辑
this.model.ditp.remark = rtnmsg.data.ditp_remark
}
},
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") {
//TODO 处理数据逻辑
this.model.ditp.remark = rtnmsg.data.ditp_remark
......@@ -412,5 +425,15 @@ export default {
},
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
src/model/Ditopn/index.js
......@@ -195,7 +195,8 @@ export default class Ditopn{
outpct:"", // Sight Amount Percentage .liaall.outpct
outamt:"", // Sight Amount .liaall.outamt
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:{
limpts:{
wrklab:"", // Label .liaall.limmod.limpts.wrklab
......@@ -245,6 +246,7 @@ export default class Ditopn{
gleflg:"", // Create gle flag .liaall.liaccv.gleflg
chgcurflg:"", // Change currency flag .liaall.liaccv.chgcurflg
pctresamt:"", // reserve amount based percent .liaall.liaccv.pctresamt
liaccvg:[],
},
},
litameadv:"", // 特殊规定 .litameadv
......
src/model/Sptsel/Event.js
......@@ -76,12 +76,12 @@ export default {
},
async continueEdit(row){
let rtnmsg = await Api.post("sptsel/getPendingData",{params:{'selsptinr':row[0]}})
if (rtnmsg.respCode == "AAAAAA") {
var cacheFileName = rtnmsg.data.cacheFileName;
let viewurl ="/business/ditopn?cacheFileName="+cacheFileName;
//let rtnmsg = await Api.post("sptsel/getPendingData",{params:{'selsptinr':row[0]}})
//if (rtnmsg.respCode == "AAAAAA") {
//var cacheFileName = rtnmsg.data.cacheFileName;
let viewurl ="/business/ditopn?selsptinr="+row[0];
this.$router.push(viewurl);
}
//}
}
}
\ No newline at end of file
src/utils/vuefunc.js
......@@ -39,9 +39,28 @@ export function dateFormat (date, 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 {
install(Vue){
Vue.prototype.findCodeLabel = findCodeLabel
Vue.prototype.dateFormat = dateFormat
Vue.prototype.moneyFormat = moneyFormat
}
}
src/views/Business/Ditopn/Detp.vue
......@@ -149,22 +149,20 @@ export default {
this.model.didgrp.blk.defdet = "";
}
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) => {
if (res.respCode = "AAAAAA"){
const data = res.data;
this.model.didgrp.blk.defdet = data.didgrp_blk_defdet;
Utils.copyValueFromVO(this.model, res.data);
}
}
);
},
recTenmaxdayEvent(){
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) => {
if (res.respCode = "AAAAAA"){
const data = res.data;
this.model.didgrp.blk.defdet = data.didgrp_blk_defdet;
Utils.copyValueFromVO(this.model, res.data);
}
}
);
......
src/views/Business/Ditopn/Engp.vue
<template>
<div class="eibs-tab">
<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.outamt" default="0.00"></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.outpct"></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="Reserved Amount">
<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.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>
<!--
Liability
<el-col :span="24">
<c-table :list="model.liaall.liaallg" style="width:80%,text-align:center">
<el-table-column prop="cbtpfx" label="Type" width="auto"> </el-table-column>
<el-table-column prop="matdat" label="Maturity" width="auto"> </el-table-column>
<el-table-column prop="tenday" label="Tenor" width="auto"> </el-table-column>
<el-table-column prop="rol" label="Dbt." width="auto"> </el-table-column>
<el-table-column prop="nam" label="Name" width="auto"> </el-table-column>
<el-table-column prop="cdtrol" label="Cdt." width="auto"> </el-table-column>
<el-table-column prop="cur" label="Cur" width="auto"> </el-table-column>
<el-table-column prop="oldamt" label="Old Amount" width="auto">
<template slot-scope="scope">
{{moneyFormat(scope.row.oldamt)}}
</template>
</el-table-column>
<el-table-column prop="amt" label="Booking Amo" width="auto">
<template slot-scope="scope">
{{moneyFormat(scope.row.amt)}}
</template>
</el-table-column>
<el-table-column prop="tenpct" label="%" width="auto"> </el-table-column>
<el-table-column prop="acc" label="Account" width="auto"> </el-table-column>
<el-table-column prop="valdat" label="Value Date" width="auto">
<template slot-scope="scope">
{{dateFormat(scope.row.valdat)}}
</template>
</el-table-column>
</c-table>
</el-col>
<el-col :span="12">
<el-form-item label="Sight Amount">
<c-input v-model="model.liaall.outamt" placeholder="请输入Sight Amount"></c-input>
......@@ -87,98 +52,31 @@
<el-form-item label="Amount not yet assigned">
<c-input v-model="model.liaall.misamt" placeholder="请输入Amount not yet assigned"></c-input>
</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-form-item label="Old Amount booked externally">
<c-input v-model="model.liaall.exttotoldamt" placeholder="请输入Old Amount booked externally"></c-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="Total booking amount external assinged">
<c-input v-model="model.liaall.exttotamt" placeholder="请输入Total booking amount external assinged"></c-input>
</el-form-item>
</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>
</el-col>
</div>
</template>
<script>
......
src/views/Business/Ditopn/Ovwp.vue
......@@ -77,6 +77,7 @@
v-model="model.didgrp.cbs.nom1.cur"
style="width: 100%"
placeholder="请选择Currency"
@keyup.enter.native="nom1CurEvent"
>
<el-option
v-for="item in codes.cur"
......@@ -674,6 +675,7 @@
maxlength="35"
show-word-limit
placeholder="请输入联行名称 电证用"
:disabled="this.jigomcFlag"
></c-input>
</el-form-item>
</el-col>
......@@ -701,6 +703,7 @@ export default {
uri: "/ditopn/getElcsRef",
},
flag: true,
jigomcFlag:false,
trade: "",
};
},
......@@ -713,13 +716,7 @@ export default {
if (res.respCode = "AAAAAA"){
//失去焦点，避免多次触发
document.getElementById('extkey').blur();
const data = 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; //申请人账号
Utils.copyValueFromVO(this.model, res.data);
this.flag = false;
}
}
......@@ -729,13 +726,9 @@ export default {
const data = Utils.flatObject(this.model);
Api.post("ditopn/executeRule/didgrp.ben.pts.extkey", data).then(
(res) => {
if (res.respCode = "AAAAAA"){
const data = 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;
}
if (res.respCode = "AAAAAA"){
Utils.copyValueFromVO(this.model, res.data);
}
}
);
},
......@@ -745,7 +738,6 @@ export default {
if (temp.length < 6){
return;
}
// 011451000006
Api.post("ditopn/executeRule/didgrp.beb.pts.bankno", data).then(
(res) => {
if (res.respCode = "AAAAAA"){
......@@ -756,9 +748,8 @@ export default {
type: 'error'
});
}else{
const data = res.data;
this.model.didgrp.beb.pts.bankno = data.didgrp_beb_pts_bankno;
this.model.didgrp.beb.pts.jigomc = data.didgrp_beb_pts_jigomc;
this.jigomcFlag = true;
Utils.copyValueFromVO(this.model, res.data);
}
}
}
......@@ -774,6 +765,17 @@ export default {
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 () {},
watch: {
......
src/views/Business/Ditopn/dialog.vue 0 → 100644
<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>
src/views/Business/Ditopn/index.vue
......@@ -32,6 +32,7 @@
<!--PD000342 -->
<m-tk :model="model" :codes="codes"/>
</el-tab-pane>
<!-- document rules
<el-tab-pane label="经办夹查询">
......@@ -52,12 +53,13 @@
<m-setpan :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000027
<el-tab-pane label="保证金">
<el-tab-pane label="或有">
<!--PD000027 -->
<m-engp :model="model" :codes="codes"/>
</el-tab-pane>
-->
<el-tab-pane label="保证金">
<m-ccvpan :model="model" :codes="codes"/>
</el-tab-pane>
......@@ -156,17 +158,16 @@ export default {
},
methods:{
tabClick(vm){
// this.$refs.modelForm.validate(valid => {
// if (valid){
// console.log(1)
// }else{
// console.log(0)
// }
// })
if(this.isInDisplay){
return
}
const label = vm.label
if (label === "或有") {
this.executeRule("liaall.engp").then(res => {
const data = res.data;
Utils.copyValueFromVO(this.model, data)
})
}
if (label === "帐务") {
this.executeRule("setmod.setpan").then(res => {
if (res.respCode == "AAAAAA"){
......@@ -176,7 +177,6 @@ export default {
})
}
if (label === "面函") {
//didgrp.adv.pts.extkey
this.executeRule("trnmod.trndoc.docpan").then(res => {
if (res.respCode == "AAAAAA"){
const data = res.data;
......@@ -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(){
console.log("进入ditopn交易");
let rtnmsg = await this.init(this.$route.query)
// let rtnmsg = {respCode: ''}
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