Skip to content

I
isc-web-vue
Commit 85c69c1f by Mr.xu
Options

Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

parents 54c87642 dd21edc2
Showing with 230 additions and 72 deletions
src/page/Frontend/Cpssxf/event/index.js
...@@ -89,6 +89,24 @@ export default { ...@@ -89,6 +89,24 @@ export default {
}, },
handleSelectionChange(val){ handleSelectionChange(val){
this.multipleSelection = val; this.multipleSelection = val;
},
addClick(){
this.addDialogVisiable = true;
},
handleClose(){
this.addDialogVisiable = false;
},
handleOn(){
this.addDialogVisiable = false;
},
fentanClick(){
this.dialogVisible = true;
},
closeDialogOpen(){
this.dialogVisible = false;
},
testClick(){
this.addDialogVisiable1=true
} }
}, },
}; };
src/page/Frontend/Cpssxf/views/Mainpl.vue
...@@ -6,35 +6,78 @@ ...@@ -6,35 +6,78 @@
<el-row> <el-row>
<c-col :span="24"> <c-col :span="24">
<c-col :span="8"> <c-col :span="8">
<el-form-item label="日期" prop="rcvdatsta" style="width: 100%"> <el-form-item
<c-col :span="11"> label="起始日期"
<c-date-picker type="date" v-model="model.sxfp.stadat" style="width: 100%"></c-date-picker> prop="rcvdatsta"
</c-col> style="width: 100%"
<c-col :span="2" style="text-align: center"> >
<label style="display: inline-block; width: 100%">-</label> <c-date-picker
</c-col> type="date"
<c-col :span="11"> v-model="model.sxfp.stadat"
<c-date-picker type="date" v-model="model.sxfp.enddat" style="width: 100%"></c-date-picker> style="width: 100%"
</c-col> ></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item
label="截止日期"
prop="rcvdatsta"
style="width: 100%"
>
<c-date-picker
type="date"
v-model="model.sxfp.stadat"
style="width: 100%"
></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
</el-row> </el-row>
<!-- 可控展示区 --> <!-- 可控展示区 -->
<el-row v-show="searchSlot.searchToggle"> <el-row v-show="searchSlot.searchToggle"> </el-row>
</el-row>
</template> </template>
</c-list-search> </c-list-search>
<el-col :span="24" style="margin-top: 2px;margin-bottom: 1px;"> <el-col :span="24" style="margin-top: 2px; margin-bottom: 1px">
<c-button :disabled="isFoldDisable" class="medium_bcs" size="medium" style="margin-left: 0" <c-button
type="primary" >{{ $t('public.归档') }} class="medium_bcs"
size="medium"
style="margin-left: 0"
type="primary"
@click="addClick()"
>{{ $t("public.新增") }}
</c-button> </c-button>
<c-button :disabled="isRoutingDisable" class="medium_bcs" size="medium" <c-button
style="margin-left: 20" type="primary">ReRouting class="medium_bcs"
size="medium"
style="margin-left: 20"
type="primary"
@click="fentanClick()"
>{{ $t("public.分摊明细") }}
</c-button> </c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 20" type="primary"> <c-button
{{ $t('public.导出Excel') }} class="medium_bcs"
size="medium"
style="margin-left: 20"
type="primary"
@click="testClick()"
>{{ $t("public.文件详情") }}
</c-button>
<c-button
class="medium_bcs"
size="medium"
style="margin-left: 20"
type="primary"
>
{{ $t("public.导出") }}
</c-button>
<c-button
class="medium_bcs"
size="medium"
style="margin-left: 20"
type="primary"
@click="fentanClick()"
>{{ $t("public.单笔分摊明细") }}
</c-button> </c-button>
</el-col> </el-col>
...@@ -43,25 +86,111 @@ ...@@ -43,25 +86,111 @@
<c-col :span="24"> <c-col :span="24">
<el-tabs v-model="activeTab" class="y-tabs"> <el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="手续费管理" name="fb"> <el-tab-pane label="手续费管理" name="fb">
<el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%" <el-table
@selection-change="handleSelectionChange" :data="stmData.data"
size="small" :border="true" height="calc(100vh - 480px)" :highlight-current-row="true"> :columns="stmData.columns"
<el-table-column type="selection" width="55"> v-loading="load"
</el-table-column> style="width: 100%"
<el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop" @selection-change="handleSelectionChange"
:min-width="item.width"> size="small"
:border="true"
height="calc(100vh - 480px)"
:highlight-current-row="true"
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column
v-for="(item, key) in stmData.columns"
:key="key"
:label="item.label"
:prop="item.prop"
:min-width="item.width"
>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" <el-pagination
:page-size="pagination.pageSize" :current-page.sync="pagination.pageNum" @size-change="handleSizeChange" layout="total, sizes, prev, pager, next, jumper"
@current-change="handleCurrentChange"> :total="pagination.total"
:page-size="pagination.pageSize"
:current-page.sync="pagination.pageNum"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
</el-pagination> </el-pagination>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</c-col> </c-col>
</div> </div>
</el-col> </el-col>
<el-dialog
v-dialogDrag
:visible.sync="addDialogVisiable"
title="手续费添加页面"
width="30%"
custom-class="add-dialog"
>
<el-form
ref="modelForm"
:model="model"
:rules="polrules"
label-position="right"
label-width="120px"
>
<div style="display: inline; margin-top: 40px">
<el-form-item label="手续费起始日期" prop="rcvdatsta">
<c-date-picker
type="date"
size="“small”"
v-model="model.rcvdatsta"
></c-date-picker>
<!-- <c-input v-model="model.remark"></c-input> -->
</el-form-item>
</div>
<div style="display: inline; margin-top: 40px">
<el-form-item label="手续费截止日期" prop="rcvdatsta">
<c-date-picker
type="date"
size="“small”"
v-model="model.rcvdatsta"
></c-date-picker>
<!-- <c-input v-model="model.remark"></c-input> -->
</el-form-item>
</div>
<el-form-item label="金额" prop="remark" style="margin-top: 10px">
<c-input v-model="model.remark" placeholder="请输入金额"></c-input>
</el-form-item>
</el-form>
<div slot="footer">
<el-button @click="handleClose">取 消</el-button>
<el-button type="primary" @click="handleOn">确 定</el-button>
</div>
</el-dialog>
<!-- -->
<!-- 分摊明细弹出框 -->
<el-dialog
:visible.sync="dialogVisible"
title="cips计费单分摊明细查询"
width="80%"
>
<el-table :data="tableData">
<el-table-column label="处理日期" prop="objtyp"></el-table-column>
<el-table-column label="系统名称" prop="linnum"></el-table-column>
<el-table-column label="分支机构号" prop="errdet"></el-table-column>
<el-table-column label="间参标识" prop="impdat"></el-table-column>
<el-table-column label="应缴费报文笔数" prop="filnam"></el-table-column>
<el-table-column label="总笔数" prop="filnam"></el-table-column>
<el-table-column label="缴费起始日期" prop="filnam"></el-table-column>
<el-table-column label="缴费截止日期" prop="filnam"></el-table-column>
<el-table-column label="应缴金额" prop="filnam"></el-table-column>
<el-table-column label="处理状态" prop="filnam"></el-table-column>
</el-table>
<div slot="footer">
<el-button type="primary" @click="modify">导出</el-button>
<el-button type="primary" @click="modify">冲账</el-button>
<el-button @click="closeDialogOpen">返回</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -73,32 +202,41 @@ export default { ...@@ -73,32 +202,41 @@ export default {
mixins: [event], mixins: [event],
data() { data() {
return { return {
activeTab: 'fb', activeTab: "fb",
load: false, load: false,
subtypCodes: [], subtypCodes: [],
multipleSelection:[], addDialogVisiable: false,
dialogheight: 20,
dialogVisible: false,
multipleSelection: [],
stmData: { stmData: {
columns: [ columns: [
{ {
label: "状态", label: "创建时间",
prop: "sta", prop: "sta",
width: "120px" width: "120px",
}, },
{ {
label: "金额", label: "金额",
prop: "amt", prop: "amt",
width: "120px" width: "120px",
}, },
{ {
label: "手续费创建起始日期", label: "计费起始日期",
prop: "stadat", prop: "stadat",
width: "120px" width: "120px",
}, },
{ {
label: "手续费创建截止日期", label: "计费截止日期",
prop: "enddat", prop: "enddat",
width: "120px" width: "120px",
}], },
{
label: "处理状态",
prop: "enddat",
width: "120px",
},
],
data: [], data: [],
}, },
pagination: { pagination: {
...@@ -108,18 +246,16 @@ width: "120px" ...@@ -108,18 +246,16 @@ width: "120px"
}, },
}; };
}, },
computed:{ computed: {
isFoldDisable: function(){ isFoldDisable: function () {
return this.multipleSelection.length == 0; return this.multipleSelection.length == 0;
} , },
isRoutingDisable:function(){ isRoutingDisable: function () {
return this.multipleSelection.length == 0; return this.multipleSelection.length == 0;
} },
},
methods: {
},
mounted: function () {
}, },
methods: {},
mounted: function () {},
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
...@@ -196,4 +332,14 @@ width: "120px" ...@@ -196,4 +332,14 @@ width: "120px"
margin-bottom: 10px; margin-bottom: 10px;
margin-right: 10px; margin-right: 10px;
} }
//弹出层的高度
::v-deep .el-dialog.add-dialog {
height: auto;
max-height: 80vh;
overflow-y: auto;
}
//弹出层里内容的高度
::v-deep .el-dialog__body {
max-height: 70vh !important;
}
</style> </style>
src/page/Funds/Crtcbk/event/buildCommons.js
...@@ -21,16 +21,13 @@ export default { ...@@ -21,16 +21,13 @@ export default {
}; };
}, },
buildCommonData(model, trnName) { buildCommonData(model, trnName) {
let ptsptaList = Utils.formatPtspta(model.fxtp.fxdgrp, this.buildPtspta); let ptsptaList = Utils.formatPtspta(model.crdgrp, this.buildPtspta);
return { return {
rec: { rec: {
objtyp: "FXT", objtyp: "CRD",
objinr: model.fxtp.fxdgrp.rec.inr,
ownref: model.fxtp.fxdgrp.rec.ownref,
}, },
cbsMap: { cbsMap: {
MAX: model.fxtp.fxdgrp.cbs.max,
NOM1: model.fxtp.fxdgrp.cbs.nom1,
}, },
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
......
src/page/Funds/Crtctf/event/buildCommons.js
...@@ -21,16 +21,13 @@ export default { ...@@ -21,16 +21,13 @@ export default {
}; };
}, },
buildCommonData(model, trnName) { buildCommonData(model, trnName) {
let ptsptaList = Utils.formatPtspta(model.fxtp.fxdgrp, this.buildPtspta); let ptsptaList = Utils.formatPtspta(model.crdgrp, this.buildPtspta);
return { return {
rec: { rec: {
objtyp: "FXT", objtyp: "CRD",
objinr: model.fxtp.fxdgrp.rec.inr,
ownref: model.fxtp.fxdgrp.rec.ownref,
}, },
cbsMap: { cbsMap: {
MAX: model.fxtp.fxdgrp.cbs.max,
NOM1: model.fxtp.fxdgrp.cbs.nom1,
}, },
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
......
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