Skip to content

V
vue-gjjs
Commit f14b2f88 by zhengxiaokui
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 445741f3 b7a97faa
Showing with 163 additions and 32 deletions
src/model/Bctacc/index.js
......@@ -120,9 +120,19 @@ export default class Bctacc{
xreflg:"", // Recalculate Rates .setmod.xreflg
setglg:{
labdspflg:"", // Label for Type of Settlement .setmod.setglg.labdspflg
setgll:[]
},
zmqacclab:"", // 主�'�号LABEL .setmod.zmqacclab
zmqacc:"", // 自�'�区主�'�号 .setmod.zmqacc
setfog:{
setfol:[]
},
setfeg:{
setfel:[]
},
glemod:{
gleshwstm: {}
}
},
liaall:{
misamt:"", // Amount not yet assigned .liaall.misamt
......@@ -131,6 +141,20 @@ export default class Bctacc{
outamt:"", // Sight Amount .liaall.outamt
exttotoldamt:"", // Old Amount booked externally .liaall.exttotoldamt
exttotamt:"", // Total booking amount external assinged .liaall.exttotamt
liaallg:[],
liaccv:{
newamt:"", // 合同金额 .liaall.liaccv.newamt
concur:"", // 应付保证金金额 .liaall.liaccv.concur
totcovamt:"", // 金额总和 .liaall.liaccv.totcovamt
newresamt:"", // Reserved Amount .liaall.liaccv.newresamt
addinf:"", // Additional Information .liaall.liaccv.addinf
cshpct:"", // 保证金应收比例 .liaall.liaccv.cshpct
relcshpct:"", // 保证金实收比例 .liaall.liaccv.relcshpct
gleflg:"", // Create gle flag .liaall.liaccv.gleflg
chgcurflg:"", // Change currency flag .liaall.liaccv.chgcurflg
pctresamt:"", // reserve amount based percent .liaall.liaccv.pctresamt
liaccvg:[],
},
},
mtabut:{
coninf:{
......@@ -170,6 +194,7 @@ export default class Bctacc{
seainf:"", // .trnmod.trndoc.rcvatt.seainf
},
filrecv:"", // File Receiver .trnmod.trndoc.filrecv
doceot:[],
},
},
pageId: "" // ctx的key
......
src/model/Ditopn/Event.js
......@@ -116,7 +116,7 @@ export default {
}
},
async onSetmodDet() {
let rtnmsg = await this.executeRule("setmod_det")
let rtnmsg = await this.executeRule("setmod.det")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......
src/views/Business/Bctacc/index.vue
......@@ -26,7 +26,9 @@
<!--Settle BC -->
<el-tab-pane label="Settle BC" name="bctset">
<c-content>
<m-bctset :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--Instructions -->
......@@ -36,7 +38,9 @@
<!--Parties -->
<el-tab-pane label="Parties" name="ptyp">
<c-content>
<m-ptyp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--Liability -->
......@@ -46,7 +50,9 @@
<!--Settlement -->
<el-tab-pane label="Settlement" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--Completion -->
......@@ -72,6 +78,7 @@
import Api from "~/service/Api"
import Utils from "~/utils/index"
import CodeTable from "~/config/CodeTable"
import CommonFuncs from "~/mixin/CommonFuncs";
import Bctacc from "~/model/Bctacc"
import CommonProcess from "~/mixin/CommonProcess"
import Check from "~/model/Bctacc/Check"
......@@ -87,7 +94,6 @@ import Docpan from "~/views/Public/Docpan"
import Doctre from "./Doctre"
export default {
name: 'Bctacc',
components:{
"m-bctset" : Bctset,
"m-detp" : Detp,
......@@ -116,10 +122,7 @@ export default {
codes: {...CodeTable },
}
},
methods:{
tabClick(){
}
},
methods:{},
created:async function(){
console.log("进入bctacc交易");
let rtnmsg = await this.init(this.$route.query)
......@@ -130,15 +133,11 @@ export default {
if (this.isInDisplay) {
this.restoreDisplay();
}
}
else
}else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
}
}
</script>
<style>
</style>
<style></style>
\ No newline at end of file
src/views/Business/Ditopn/Ovwp.vue
......@@ -239,6 +239,7 @@
<c-date-picker
type="date"
v-model="model.didgrp.rec.opndat"
value-format="yyyy-MM-dd"
style="width: 95%"
placeholder="请选择Date"
></c-date-picker>
......
src/views/Business/Ditopn/index.vue
......@@ -149,8 +149,8 @@ import Engp from "./Engp";
import Addbcb from "./Addbcb";
import Limitbody from "./Limitbody";
import Coninfp from "./Coninfp";
import Ccvpan from "./Ccvpan";
import Ccvpan from "~/views/Public/Ccvpan";
import Glepan from "~/views/Public/Glepan";
import Setpan from "~/views/Public/Setpan";
import Docpan from "~/views/Public/Docpan";
......
src/views/Home/cells/TaskStatistics.vue
......@@ -85,13 +85,13 @@ export default {
color: #f3f3f3;
}
.task-stat-display.total {
background-color: #045e92;
background-color: #1d8dcdcc;
}
.task-stat-display.mime {
background-color: #871f5a;
background-color: #64043ba8;
}
.task-stat-display.pty {
background-color: #149457;
background-color: #17bf6fcc;
}
.task-stat-display .stat-item {
width: 100px;
......
src/views/Public/Ccvpan.vue
<template>
<div class="eibs-tab">
<!--
<c-col :span="12">
<el-form-item label="应付保证金金额">
<c-input v-model="model.liaall.liaccv.concur" maxlength="3" placeholder="请输入应付保证金金额"></c-input>
</el-form-item>
</c-col>
-->
<c-col :span="12">
<el-form-item label="合同金额" prop="liaall.liaccv.concur">
<c-row :gutter="20">
<!-- <c-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </c-col>-->
<c-col :span="8">
<c-select
v-model="model.liaall.liaccv.concur"
......@@ -28,7 +38,18 @@
</c-row>
</el-form-item>
</c-col>
<!--
<c-col :span="12">
<el-form-item label="合同金额">
<c-input v-model="model.liaall.liaccv.newamt" placeholder="请输入合同金额"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="保证金应收比例">
<c-input v-model="model.liaall.liaccv.cshpct" placeholder="请输入保证金应收比例"></c-input>
</el-form-item>
</c-col>
-->
<c-col :span="12">
<el-form-item label="保证金应收比例" prop="liaall.liaccv.cshpct">
<c-row>
......@@ -42,9 +63,19 @@
</el-form-item>
</c-col>
<!--
<c-col :span="12">
<el-form-item label="Reserved Amount">
<c-input v-model="model.liaall.liaccv.newresamt" placeholder="请输入Reserved Amount"></c-input>
</el-form-item>
</c-col>
-->
<c-col :span="12">
<el-form-item label="Reserved Amount" prop="liaall.liaccv.newresamt">
<c-row :gutter="20">
<!-- <c-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </c-col>-->
<c-col :span="8">
<c-select
v-model="model.liaall.liaccv.concur"
......@@ -70,12 +101,21 @@
</c-row>
</el-form-item>
</c-col>
<!--
<c-col :span="12">
<el-form-item label="保证金实收比例">
<c-input v-model="model.liaall.liaccv.relcshpct" placeholder="请输入保证金实收比例"></c-input>
</el-form-item>
</c-col>
-->
<c-col :span="12">
<el-form-item label="保证金实收比例" prop="liaall.misamt">
<el-form-item label="保证金实收比例" prop="liaall.liaccv.relcshpct">
<c-row>
<c-col :span="8">
<c-input :readonly="true" v-model="model.liaall.misamt"></c-input>
<c-input
:readonly="true"
v-model="model.liaall.liaccv.relcshpct"
></c-input>
</c-col>
<c-col :span="12" style="margin-left: 20px">
<span>%</span>
......@@ -84,9 +124,28 @@
</el-form-item>
</c-col>
<!--
<c-col :span="12">
<c-checkbox v-model="model.liaall.liaccv.gleflg">Create gle flag</c-checkbox>
</c-col>
<c-col :span="12">
<el-form-item label="reserve amount based percent">
<c-input v-model="model.liaall.liaccv.pctresamt" placeholder="请输入reserve amount based percent"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.liaall.liaccv.chgcurflg">Change currency flag</c-checkbox>
</c-col>
-->
<c-col :span="12">
<el-form-item label="应付保证金金额" prop="liaall.liaccv.concur">
<c-row :gutter="20">
<!-- <c-col :span="8">-->
<!-- <c-input type="text" :readonly="true" value="CNY"></c-input>-->
<!-- </c-col>-->
<c-col :span="8">
<c-select
v-model="model.liaall.liaccv.concur"
......@@ -112,10 +171,22 @@
</c-row>
</el-form-item>
</c-col>
<!--
<c-col :span="12">
<c-button size="small" type="primary" @click="openMask">
Add
</c-button>
</c-col>
<c-col :span="12">
<c-button size="small" icon="el-icon-delete" @click="onLiaccvDel">
Del
</c-button>
</c-col>
-->
<c-col :span="24" style="text-align: right">
<c-row>
<c-col :span="2" :offset="19">
<c-col :span="2" :offset="20">
<c-button size="small" type="primary" @click="onLiaccvAdd">
Add
</c-button>
......@@ -136,13 +207,11 @@
</el-dialog>
</c-col>
<c-col :span="2">
<template slot-scope="scope">
<c-button size="small" icon="el-icon-delete" @click="onLiaccvDel(scope.$index,scope.row)">
<!-- <c-col :span="2">
<c-button size="small" icon="el-icon-delete" @click="onLiaccvDel">
Del
</c-button>
</template>
</c-col>
</c-col> -->
</c-row>
</c-col>
......@@ -154,7 +223,7 @@
:list="model.liaall.liaccv.liaccvg"
style="width:80%,text-align:center"
>
<el-table-column prop="ccdflg" label="CFO" width="auto">
<el-table-column prop="ccdflg" label="CF000048" width="auto">
</el-table-column>
<el-table-column prop="ownref" label="保证金编号" width="auto">
</el-table-column>
......@@ -172,9 +241,45 @@
</el-table-column>
<el-table-column prop="covamt" label="折算后金额" width="auto">
</el-table-column>
<el-table-column prop="acccovamt" label="Acc Amount" width="auto">
</el-table-column>
<el-table-column label="OP" width="auto">
<template slot-scope="scope">
<c-button size="small" icon="el-icon-delete" @click="onLiaccvDel(scope.$index,scope.row)" />
</template>
</el-table-column>
</c-table>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Amount Covered">
<c-row>
<c-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"
>
</el-option>
</c-select>
</c-col>
<c-col :span="14">
<c-input
v-model="model.liaall.liaccv.totcovamt"
:readonly="true"
></c-input>
</c-col>
</c-row>
</el-form-item>
</c-col> -->
<c-col :span="24">
<el-form-item label="金额总和">
<c-col :span="8">
......@@ -191,7 +296,7 @@
<el-form-item label="Additional Information ">
<c-input
type="textarea"
rows="5"
:rows="5"
v-model="model.liaall.liaccv.addinf"
maxlength="200"
show-word-limit
......@@ -216,12 +321,12 @@ export default {
dialogTableVisible: false,
stmData: {
columns: [
'1 1:1 "Ref." 120',
'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',
'6 6:1 "Amt" 80 2 0 1 18.3',
'7 7:1 "Open date" 80 4 7',
'8 8:1 "flg" 40',
'9 9:1 "Remarks" 180',
......
src/views/Public/Setpan.vue
......@@ -4,7 +4,7 @@
<c-col :span="6" style="margin-left:9px">
<el-form-item label="参考号" label-width="50px">
<c-input
v-model="model.setmod.ref"
v-model="model.didgrp.rec.ownref"
maxlength="16"
:readonly="true"
placeholder="请输入our reference"
......
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