Commit 725c2e23 by wangna

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 838f8704 36f4701b
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align: center"><span>操作</span></c-col> <c-col :span="11" style="text-align: center"><span>操作</span></c-col>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 申请一个弹出主键放在插槽,加工已渲染的数据 --> <!-- 申请一个弹出主键放在插槽,加工已渲染的数据 -->
<el-popover <el-popover
...@@ -450,17 +450,17 @@ export default { ...@@ -450,17 +450,17 @@ export default {
pattern: "date", pattern: "date",
label: "关闭日期", label: "关闭日期",
}, },
'8 19 "分行名称" 136', '8 19 "分行名称" 160',
//'9 18 "PTA NO." 150', //'9 18 "PTA NO." 150',
'10 5 "申请人编号" 191', '10 5 "申请人编号" 191',
'11 6 "申请人名称" 191', '11 6 "申请人名称" 191',
'12 7 "申请人名称(中文)" 191', //'12 7 "申请人名称(中文)" 191',
'13 10 "通知银行BIC编码" 165', '13 10 "通知银行BIC编码" 165',
'14 8 "受益人编号" 165', //'14 8 "受益人编号" 165',
'15 9 "受益人名称" 165', '15 9 "受益人名称" 165',
'16 14 "名义币种" 100', '16 14 "币种" 100',
'17 15 "名义金额" 130 2 8 1 16', '17 15 "金额" 130 2 8 1 16',
'18 16 "余额币种" 100', //'18 16 "余额币种" 100',
'19 17 "余额" 130 2 8 1 18', '19 17 "余额" 130 2 8 1 18',
], ],
data: [], data: [],
......
...@@ -173,7 +173,9 @@ ...@@ -173,7 +173,9 @@
<c-istream-table <c-istream-table
:list="stmData.data" :list="stmData.data"
:columns="stmData.columns" :columns="stmData.columns"
:paginationShow="false" :paginationShow="true"
:total="stmData.data.length"
:tableData="stmData.data"
> >
<el-table-column prop="op" label="OP" width="80" fixed="right"> <el-table-column prop="op" label="OP" width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -194,6 +196,7 @@ ...@@ -194,6 +196,7 @@
<c-table <c-table
:border="true" :border="true"
:list="model.liaall.liaccv.liaccvg" :list="model.liaall.liaccv.liaccvg"
:total="model.liaall.liaccv.liaccvg.length"
style="width:100%,text-align:center" style="width:100%,text-align:center"
> >
<el-table-column prop="ccdflg" label="调整标识" width="70px"> <el-table-column prop="ccdflg" label="调整标识" width="70px">
...@@ -202,9 +205,21 @@ ...@@ -202,9 +205,21 @@
</el-table-column> </el-table-column>
<el-table-column prop="cur" label="币种" width="70px"> <el-table-column prop="cur" label="币种" width="70px">
</el-table-column> </el-table-column>
<el-table-column prop="oldamt" label="余额" width="150px"> <el-table-column prop="oldamt" label="余额" width="110px">
<template slot-scope="scope">
<c-input-currency
v-model="scope.row.oldamt"
placeholder="0.00"
></c-input-currency>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="amt" label="变动金额" width="150px"> <el-table-column prop="amt" label="变动金额" width="110px">
<template slot-scope="scope">
<c-input-currency
v-model="scope.row.amt"
placeholder="0.00"
></c-input-currency>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="acc" label="保证金账号" width="180px"> <el-table-column prop="acc" label="保证金账号" width="180px">
</el-table-column> </el-table-column>
...@@ -212,9 +227,21 @@ ...@@ -212,9 +227,21 @@
</el-table-column> </el-table-column>
<el-table-column prop="concur" label="币种" width="70px"> <el-table-column prop="concur" label="币种" width="70px">
</el-table-column> </el-table-column>
<el-table-column prop="covamt" label="折算后金额" width="150px"> <el-table-column prop="covamt" label="折算后金额" width="110px">
<template slot-scope="scope">
<c-input-currency
v-model="scope.row.covamt"
placeholder="0.00"
></c-input-currency>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="acccovamt" label="实际折算金额" width="150px"> <el-table-column prop="acccovamt" label="实际折算金额" width="150px">
<template slot-scope="scope">
<c-input-currency
v-model="scope.row.acccovamt"
placeholder="0.00"
></c-input-currency>
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="auto" fixed="right" align="center"> <el-table-column label="操作" width="auto" fixed="right" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
</c-input> </c-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="" width="auto"> <el-table-column label="" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
label-width="0" label-width="0"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
:list="model.liaall.liaallg" :list="model.liaall.liaallg"
style="width:100%,text-align:center,margin-bottom:18px" style="width:100%,text-align:center,margin-bottom:18px"
:border="true" :border="true"
:total="model.liaall.liaallg.length"
> >
<el-table-column prop="bussec" label="业务" width="70px"> <el-table-column prop="bussec" label="业务" width="70px">
</el-table-column> </el-table-column>
...@@ -56,19 +57,31 @@ ...@@ -56,19 +57,31 @@
</el-table-column> </el-table-column>
<el-table-column prop="cur" label="币种" width="70px"> <el-table-column prop="cur" label="币种" width="70px">
</el-table-column> </el-table-column>
<el-table-column prop="oldamt" label="原始金额" width="150px"> <el-table-column prop="oldamt" label="原始金额" width="110px">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
{{moneyFormat(scope.row.oldamt)}} {{moneyFormat(scope.row.oldamt)}}
</template> --> </template> -->
<template slot-scope="scope">
<c-input-currency
v-model="scope.row.docamt"
placeholder="0.00"
></c-input-currency>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="amt" label="记账金额" width="150px"> <el-table-column prop="amt" label="记账金额" width="110px">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
{{moneyFormat(scope.row.amt)}} {{moneyFormat(scope.row.amt)}}
</template> --> </template> -->
<template slot-scope="scope">
<c-input-currency
v-model="scope.row.amt"
placeholder="0.00"
></c-input-currency>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="tenpct" label="%" width="70px"> <el-table-column prop="tenpct" label="%" width="70px">
</el-table-column> </el-table-column>
<el-table-column prop="acc" label="核心账号" width="170px"> <el-table-column prop="acc" label="核心账号" width="200px">
<!-- check,需用el-form-item标签包起来 --> <!-- check,需用el-form-item标签包起来 -->
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
...@@ -85,7 +98,7 @@ ...@@ -85,7 +98,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="valdat" label="起息日" width="auto"> <el-table-column prop="valdat" label="起息日" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ dateFormat(scope.row.valdat) }} {{ dateFormat(scope.row.valdat) }}
</template> </template>
......
...@@ -124,8 +124,9 @@ ...@@ -124,8 +124,9 @@
<c-table <c-table
style="text-align: center" style="text-align: center"
:list="model.setmod.setfog.setfol" :list="model.setmod.setfog.setfol"
:paginationShow="false" :paginationShow="true"
:border="true" :border="true"
:total="model.setmod.setfog.setfol.length"
> >
<el-table-column label="付款人" width="110px"> <el-table-column label="付款人" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -186,12 +187,17 @@ ...@@ -186,12 +187,17 @@
</c-select> </c-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="金额" prop="amt" width="auto"> <el-table-column label="金额" prop="amt" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
label-width="0" label-width="0"
:prop="'setmod.setfog.setfol.' + scope.$index + '.amt'" :prop="'setmod.setfog.setfol.' + scope.$index + '.amt'"
></el-form-item> >
<c-input-currency
v-model="scope.row.amt"
placeholder="0.00"
></c-input-currency>
</el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="" prop="det" width="150px" fixed="right"> <el-table-column label="" prop="det" width="150px" fixed="right">
...@@ -305,8 +311,9 @@ ...@@ -305,8 +311,9 @@
<c-table <c-table
style="text-align: center" style="text-align: center"
:list="model.setmod.setfeg.setfel" :list="model.setmod.setfeg.setfel"
:paginationShow="false" :paginationShow="true"
:border="true" :border="true"
:total="model.setmod.setfeg.setfel.length"
> >
<el-table-column label="收取对象" width="110px"> <el-table-column label="收取对象" width="110px">
<template #default="scope"> <template #default="scope">
...@@ -390,15 +397,24 @@ ...@@ -390,15 +397,24 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="应收金额" prop="ogiamt" width="150px"> <el-table-column label="应收金额" prop="ogiamt" width="110px">
<template slot-scope="scope">
<c-input-currency
v-model="scope.row.ogiamt"
placeholder="0.00"
></c-input-currency>
</template>
</el-table-column> </el-table-column>
<el-table-column label="实收金额" prop="amt" width="auto"> <el-table-column label="实收金额" prop="amt" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
label-width="0" label-width="0"
:prop="'setmod.setfeg.setfel.' + scope.$index + '.amt'" :prop="'setmod.setfeg.setfel.' + scope.$index + '.amt'"
> >
{{ scope.row.amt }} <c-input-currency
v-model="scope.row.amt"
placeholder="0.00"
></c-input-currency>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -452,8 +468,9 @@ ...@@ -452,8 +468,9 @@
<c-table <c-table
style="text-align: center" style="text-align: center"
:list="stmData3" :list="stmData3"
:paginationShow="false" :paginationShow="true"
:border="true" :border="true"
:total="stmData3.length"
> >
<el-table-column label="修改标识" prop="modflg" width="70px"> <el-table-column label="修改标识" prop="modflg" width="70px">
</el-table-column> </el-table-column>
...@@ -461,8 +478,11 @@ ...@@ -461,8 +478,11 @@
</el-table-column> </el-table-column>
<el-table-column label="即收币种" prop="acccur" width="110px"> <el-table-column label="即收币种" prop="acccur" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<c-select v-model="scope.row.acccur" @change="accucrChange(scope.$index)"> <c-select
<!-- @change="eventfunction('setgll.accur')" --> v-model="scope.row.acccur"
@change="accucrChange(scope.$index)"
>
<!-- @change="eventfunction('setgll.accur')" -->
<el-option <el-option
v-for="item in codes.acccur" v-for="item in codes.acccur"
:key="item.value" :key="item.value"
...@@ -474,13 +494,18 @@ ...@@ -474,13 +494,18 @@
</c-select> </c-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记账金额" prop="fmtaccamt" width="150px"> <el-table-column label="记账金额" prop="fmtaccamt" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<c-input <!-- <c-input
v-model="scope.row.fmtaccamt" v-model="scope.row.fmtaccamt"
@change="fmtaccamtChange(scope.$index)" @change="fmtaccamtChange(scope.$index)"
/> /> -->
</template> <c-input-currency
v-model="scope.row.fmtaccamt"
placeholder="0.00"
@change="fmtaccamtChange(scope.$index)"
></c-input-currency>
</template>
</el-table-column> </el-table-column>
<el-table-column label="处理方式" width="110px"> <el-table-column label="处理方式" width="110px">
<template #default="scope"> <template #default="scope">
...@@ -521,7 +546,13 @@ ...@@ -521,7 +546,13 @@
</el-table-column> </el-table-column>
<el-table-column label="原始币种" prop="cur" width="70px"> <el-table-column label="原始币种" prop="cur" width="70px">
</el-table-column> </el-table-column>
<el-table-column label="原始金额" prop="fmtamt" width="150px"> <el-table-column label="原始金额" prop="fmtamt" width="110px">
<template slot-scope="scope">
<c-input-currency
v-model="scope.row.fmtamt"
placeholder="0.00"
></c-input-currency>
</template>
</el-table-column> </el-table-column>
<el-table-column label="汇率" prop="rat" width="auto"> <el-table-column label="汇率" prop="rat" width="auto">
</el-table-column> </el-table-column>
...@@ -1473,19 +1504,19 @@ export default { ...@@ -1473,19 +1504,19 @@ export default {
this.$notify.error({ title: "错误", message: "服务请求失败!" }); this.$notify.error({ title: "错误", message: "服务请求失败!" });
} }
}, },
async accucrChange(index){ async accucrChange(index) {
let rtnmsg = await this.executeRule( let rtnmsg = await this.executeRule(
"setmod.setglg.setgll(" + (index + 1) + ").acccur" "setmod.setglg.setgll(" + (index + 1) + ").acccur"
); );
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.updateModel(rtnmsg.data); this.updateModel(rtnmsg.data);
this.$nextTick(()=>{ this.$nextTick(() => {
this.executeRule("setmod.glemod.glepan").then((res) => { this.executeRule("setmod.glemod.glepan").then((res) => {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
if (res.respCode == SUCCESS) this.updateModel(res.data) if (res.respCode == SUCCESS) this.updateModel(res.data);
}) });
}) });
} }
}, },
async fmtaccamtChange(index) { async fmtaccamtChange(index) {
...@@ -1495,27 +1526,27 @@ export default { ...@@ -1495,27 +1526,27 @@ export default {
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.updateModel(rtnmsg.data); this.updateModel(rtnmsg.data);
this.$nextTick(()=>{ this.$nextTick(() => {
this.executeRule("setmod.glemod.glepan").then((res) => { this.executeRule("setmod.glemod.glepan").then((res) => {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
if (res.respCode == SUCCESS) this.updateModel(res.data) if (res.respCode == SUCCESS) this.updateModel(res.data);
}) });
}) });
} }
}, },
async dspChange(index){ async dspChange(index) {
let rtnmsg = await this.executeDefault( let rtnmsg = await this.executeDefault(
"setmod.setglg.setgll(" + (index + 1) + ").dsp" "setmod.setglg.setgll(" + (index + 1) + ").dsp"
); );
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.updateModel(rtnmsg.data); this.updateModel(rtnmsg.data);
this.$nextTick(()=>{ this.$nextTick(() => {
this.executeRule("setmod.glemod.glepan").then((res) => { this.executeRule("setmod.glemod.glepan").then((res) => {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
if (res.respCode == SUCCESS) this.updateModel(res.data) if (res.respCode == SUCCESS) this.updateModel(res.data);
}) });
}) });
} }
}, },
}, },
......
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