Skip to content

V
vue-gjjs
Commit be40f0b4 by wangguangchao
Options

或有和保证金

parent d63fbb0e
Showing with 302 additions and 248 deletions
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))
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: '服务请求失败！' });
// }
// })
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 => {
......@@ -413,5 +426,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/Ccvpan.vue
......@@ -10,19 +10,31 @@
<el-col :span="12">
<el-form-item label="合同金额" prop="liaall.liaccv.concur">
<el-row>
<!-- <el-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </el-col>-->
<el-col :span="8">
<c-select v-model="model.liaall.liaccv.concur" disabled style="width:100%" placeholder="请选择Type of settlement">
<el-option v-for="item in codes.curtxt" :key="item.value" :label="item.label"
:value="item.value">
<c-select
v-model="model.liaall.liaccv.concur"
disabled
style="width: 100%"
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>
</el-col>
<el-col :span="14">
<c-input :readonly="true" v-model="model.liaall.liaccv.newamt"></c-input>
<c-input
:readonly="true"
v-model="model.liaall.liaccv.newamt"
></c-input>
</el-col>
</el-row>
</el-form-item>
......@@ -45,7 +57,7 @@
<el-col :span="8">
<c-input v-model="model.liaall.liaccv.cshpct"></c-input>
</el-col>
<el-col :span="12" style="margin-left:20px">
<el-col :span="12" style="margin-left: 20px">
<span>%</span>
</el-col>
</el-row>
......@@ -62,18 +74,30 @@
<el-col :span="12">
<el-form-item label="Reserved Amount" prop="liaall.liaccv.newresamt">
<el-row>
<!-- <el-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </el-col>-->
<el-col :span="8">
<c-select v-model="model.liaall.liaccv.concur" disabled style="width:100%" placeholder="请选择Type of settlement">
<el-option v-for="item in codes.curtxt" :key="item.value" :label="item.label"
:value="item.value">
<c-select
v-model="model.liaall.liaccv.concur"
disabled
style="width: 100%"
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>
</el-col>
<el-col :span="14">
<c-input :readonly="true" v-model="model.liaall.liaccv.newresamt"></c-input>
<c-input
:readonly="true"
v-model="model.liaall.liaccv.newresamt"
></c-input>
</el-col>
</el-row>
</el-form-item>
......@@ -91,7 +115,7 @@
<el-col :span="8">
<c-input :readonly="true" v-model="model.liaall.misamt"></c-input>
</el-col>
<el-col :span="12" style="margin-left:20px">
<el-col :span="12" style="margin-left: 20px">
<span>%</span>
</el-col>
</el-row>
......@@ -117,25 +141,37 @@
<el-col :span="12">
<el-form-item label="应付保证金金额" prop="liaall.liaccv.concur">
<el-row>
<!-- <el-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </el-col>-->
<el-col :span="8">
<c-select v-model="model.liaall.liaccv.concur" disabled style="width:100%" placeholder="请选择Type of settlement">
<el-option v-for="item in codes.curtxt" :key="item.value" :label="item.label"
:value="item.value">
<c-select
v-model="model.liaall.liaccv.concur"
disabled
style="width: 100%"
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>
</el-col>
<el-col :span="14">
<c-input :readonly="true" v-model="model.liaall.liaccv.pctresamt"></c-input>
<c-input
:readonly="true"
v-model="model.liaall.liaccv.pctresamt"
></c-input>
</el-col>
</el-row>
</el-form-item>
</el-col>
<!--
<el-col :span="12">
<c-button size="small" type="primary" @click="onLiaccvAdd">
<c-button size="small" type="primary" @click="openMask">
Add
</c-button>
</el-col>
......@@ -146,12 +182,31 @@
</c-button>
</el-col>
-->
<el-col :span="24" style="text-align:right">
<el-col :span="24" style="text-align: right">
<el-row>
<el-col :span="2">
<c-button size="small" type="primary" @click="onLiaccvAdd">
<c-button
size="small"
type="primary"
@click="onLiaccvAdd"
>
Add
</c-button>
<el-dialog :visible.sync="dialogTableVisible" :close-on-click-modal="false" :close-on-press-escape="false">
<c-istream-table
:list="stmData.data"
:columns="stmData.columns"
>
<el-table-column
prop="op"
label="OP"
width="100">
<template slot-scope="scope">
<a href="javascript:void(0)" @click="pickDepItem(scope.row)">选择</a>
</template>
</el-table-column>
</c-istream-table>
</el-dialog>
</el-col>
<el-col :span="2">
......@@ -163,105 +218,101 @@
</el-col>
<el-col :span="24">
<c-table style="width:80%,text-align:center">
<el-table-column
label="CFO"
width="auto"
>
</el-table-column>
<el-table-column
label="保证金编号"
width="auto"
>
</el-table-column>
<el-table-column
label="货币"
width="auto"
>
</el-table-column>
<el-table-column
label="余额"
width="auto"
>
</el-table-column>
<el-table-column
label="变动金额"
width="auto"
>
</el-table-column>
<el-table-column
label="保证金账号"
width="auto"
>
</el-table-column>
<el-table-column
label="汇率"
width="auto"
>
</el-table-column>
<el-table-column
label=""
width="auto"
>
</el-table-column>
<el-table-column
label="折算后金额"
width="auto"
>
</el-table-column>
<c-table :list="model.liaall.liaccv.liaccvg" style="width:80%,text-align:center">
<el-table-column prop="ccdflg" label="CFO" width="auto"> </el-table-column>
<el-table-column prop="ownref" label="保证金编号" width="auto"> </el-table-column>
<el-table-column prop="cur" label="币种" width="auto"> </el-table-column>
<el-table-column prop="oldamt" label="余额" width="auto"> </el-table-column>
<el-table-column prop="amt" label="变动金额" width="auto"> </el-table-column>
<el-table-column prop="acc" label="保证金账号" width="auto"> </el-table-column>
<el-table-column prop="rat" label="汇率" width="auto"> </el-table-column>
<el-table-column prop="concur" label="币种" width="auto"> </el-table-column>
<el-table-column prop="covamt" label="折算后金额" width="auto"> </el-table-column>
</c-table>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="Amount Covered">
<el-row>
<el-col :span="8">
<c-select v-model="model.liaall.liaccv.concur" disabled style="width:100%" placeholder="请选择Type of settlement">
<el-option v-for="item in codes.curtxt" :key="item.value" :label="item.label"
:value="item.value">
<c-select
v-model="model.liaall.liaccv.concur"
disabled
style="width: 100%"
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>
</el-col>
<el-col :span="14">
<c-input v-model="model.liaall.liaccv.totcovamt" :readonly="true" ></c-input>
<c-input
v-model="model.liaall.liaccv.totcovamt"
:readonly="true"
></c-input>
</el-col>
</el-row>
</el-form-item>
</el-col>
</el-col> -->
<!--
<el-col :span="12">
<el-col :span="24">
<el-form-item label="金额总和">
<el-col :span="8">
<c-input v-model="model.liaall.liaccv.totcovamt" placeholder="请输入金额总和"></c-input>
</el-col>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="Additional Information ">
<c-input type="textarea" v-model="model.liaall.liaccv.addinf" maxlength="70" show-word-limit placeholder="请输入Additional Information " ></c-input>
</el-form-item>
</el-col>
-->
</div>
</template>
<script>
import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Ditopn/Event"
import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Ditopn/Event";
export default {
props:["model","codes"],
data(){
props: ["model", "codes"],
data() {
return {
}
dialogTableVisible: false,
stmData: {
columns: [
'1 1:1 "Ref." 120',
'2 2:1 "User" 80',
'3 3:1 "Applicant" 196',
'4 4:1 "Account" 120',
'5 5:1 "Cur" 50',
'6 6:1 "Amount" 80 2 0 1 18.3',
'7 7:1 "Open date" 80 4 7',
'8 8:1 "flg" 40',
'9 9:1 "Remarks" 180',
"P COLORED TRUE",
"P VERTLINES TRUE",
"P HORZLINES TRUE",
"P MULTISELECT FALSE",
"P COLUMNSIZING TRUE",
],
data: [],
},
methods:{...Event},
created:function(){
}
}
relrowDisabled: true,
};
},
methods: { ...Event },
created: function () {},
};
</script>
<style>
</style>
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>
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="应付保证金金额">
<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-form-item label="Sight Amount">
<c-input v-model="model.liaall.outamt" placeholder="请输入Sight Amount"></c-input>
</el-form-item>
......@@ -90,93 +55,26 @@
</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
Add to Current Line
</c-button>
</el-col>
<el-col :span="2">
<el-col :span="12">
<c-button size="small" type="primary" @click="onLiaallButmissig">
Del
Add to Sight Amount
</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 :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="金额总和">
<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 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>
</div>
......
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
......@@ -33,6 +33,7 @@
<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>
......@@ -167,6 +169,12 @@ export default {
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"){
......
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