Commit ae71d89b by Wuyuqiu

样式调整

parent 1698b3fd
...@@ -268,7 +268,141 @@ ...@@ -268,7 +268,141 @@
</template> </template>
</c-list-search> </c-list-search>
<div style="height: 90%"> <div>
<c-col :span="24">
<el-table
:header-cell-style="{background: 'linear-gradient(180deg, #FFFFFF 0%, #F1F1F1 100%)'}"
:header-row-style="{height: '5px'}"
:row-style="{height: '5px'}"
:cell-style="{padding: '0px'}"
v-loading="load"
:data="stmData.data"
style="width:100%;"
size="small"
:border="true"
height="calc(100vh - 482px)"
:highlight-current-row="true"
@row-click="TableRowClick"
@row-dblclick="TableDblRow"
>
<el-table-column label="单据编号" prop="ownref" align="left" fixed="left" min-width="150" :show-overflow-tooltip="true" sortable>
</el-table-column>
<el-table-column label="客户经理" prop="ownusr" align="left" min-width="100" sortable>
</el-table-column>
<el-table-column label="单据币种" prop="maxcur" align="left" min-width="100" sortable>
</el-table-column>
<el-table-column label="单据金额" prop="maxamt" align="left" min-width="150" :show-overflow-tooltip="true" sortable>
<template slot-scope="scope">
<span> {{moneyFormat(scope.row.maxamt, scope.row.maxcur) }}
</span>
</template>
</el-table-column>
<el-table-column label="创建日期" prop="opndat" align="left" min-width="150" :show-overflow-tooltip="true" sortable>
</el-table-column>
<el-table-column label="申请人编号" prop="aplref" align="left" min-width="200" :show-overflow-tooltip="true" sortable>
</el-table-column>
<el-table-column label="申请人名称" prop="aplnam" align="left" min-width="200" :show-overflow-tooltip="true" sortable>
</el-table-column>
<el-table-column label="受益人名称" prop="benefi" align="left" min-width="200" :show-overflow-tooltip="true" sortable>
</el-table-column>
<el-table-column label="交单行编号" prop="bankno" align="left" min-width="200" :show-overflow-tooltip="true" sortable>
</el-table-column>
<el-table-column label="关闭日期" prop="clsdat" align="left" min-width="150" :show-overflow-tooltip="true" sortable>
</el-table-column>
<el-table-column label="货物类型" prop="stagod" align="left" min-width="150" :show-overflow-tooltip="true" sortable>
</el-table-column>
<el-table-column fixed="right" prop="op" label="操作" width="150px">
<template slot="header">
<c-col :span="11" style="text-align: center">
<span>操作</span>
</c-col>
</template>
<template slot-scope="scope">
<el-popover
placement="top-start"
title="历史信息"
width="800"
trigger="click"
:ref="'popover_' + scope.row.IDX"
>
<div
style="
text-align: right;
margin-top: -30px;
margin-right: 5px;
font-size: 16px;
"
>
<span
class="el-icon-close"
style="cursor: pointer"
@click="closeDetailsDialog('popover_' + scope.row.IDX)"
></span>
</div>
<el-table
:data="trnData.data"
:columns="trnData.columns"
:showButtonFlg="true"
>
<el-table-column
v-for="(item, key) in trnData.columns"
:key="key"
:label="item.label"
:prop="item.prop"
>
<template slot-scope="scope">
<div>{{ scope.row[item.prop] }}</div>
</template>
</el-table-column>
<el-table-column
fixed="right"
prop="op"
label="操作"
width="250px"
>
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
@click="display(scope.row['inr'])"
>详情</c-button
>
</template>
</el-table-column>
</el-table>
<c-button
style="margin-left: 0"
size="small"
slot="reference"
@click="details(scope.row)"
>
详情
</c-button>
</el-popover>
<c-button
style="margin-left: 5px"
size="small"
type="primary"
v-if="!isInfo"
@click="handler(scope.row)"
>处理
</c-button>
</template>
</el-table-column>
</el-table>
<el-pagination
layout="total, sizes, prev, pager, next, jumper"
:total="pagination.total"
:page-size="pagination.pageSize"
:current-page.sync="pagination.pageIndex"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
</el-pagination>
</c-col>
</div>
<!-- <div>
<c-col :span="24"> <c-col :span="24">
<el-table <el-table
:data="stmData.data" :data="stmData.data"
...@@ -374,7 +508,7 @@ ...@@ -374,7 +508,7 @@
</el-pagination> </el-pagination>
</div> </div>
</c-col> </c-col>
</div> </div> -->
<!-- 点击处理ba弹框 --> <!-- 点击处理ba弹框 -->
<el-dialog <el-dialog
:visible.sync="initdialog" :visible.sync="initdialog"
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
size="small" size="small"
:validate-on-rule-change="false" :validate-on-rule-change="false"
> >
<c-content> <!-- <c-content> -->
<m-infsea :model="model" :codes="codes" ref="infsea" /> <m-infsea :model="model" :codes="codes" ref="infsea" />
</c-content> <!-- </c-content> -->
</el-form> </el-form>
</div> </div>
</template> </template>
......
...@@ -244,9 +244,9 @@ ...@@ -244,9 +244,9 @@
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="pagination.total" :total="pagination.total"
:page-size="pagination.pageSize" :page-size="pagination.pageSize"
:current-page.sync="pagination.pageNum" :current-page.sync="pagination.pageIndex"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="currentChange" @current-change="handleCurrentChange"
> >
</el-pagination> </el-pagination>
</c-col> </c-col>
......
...@@ -89,11 +89,6 @@ ...@@ -89,11 +89,6 @@
</c-col> </c-col>
</el-row> </el-row>
<c-col :span="24" style="">
<div style="border-bottom: 10px solid rgb(232, 232, 232)">
</div>
</c-col>
<el-row> <el-row>
<c-col :span="24" style="margin-top:20px;"> <c-col :span="24" style="margin-top:20px;">
<el-table <el-table
...@@ -113,7 +108,7 @@ ...@@ -113,7 +108,7 @@
:formatter="item.rounding" :formatter="item.rounding"
:header-align="item.headerAlign" :header-align="item.headerAlign"
:align="item.align" :align="item.align"
:width="item.width" :min-width="item.width"
show-overflow-tooltip="true" show-overflow-tooltip="true"
sortable sortable
> >
...@@ -177,7 +172,7 @@ ...@@ -177,7 +172,7 @@
{ label: "业务编号", prop: "ownref" , width: "100px"}, { label: "业务编号", prop: "ownref" , width: "100px"},
{ label: "摘要信息", prop: "addtxt" , width: "200px"}, { label: "摘要信息", prop: "addtxt" , width: "200px"},
{ label: "币种", prop: "reloricur", width: "70px" }, { label: "币种", prop: "reloricur", width: "70px" },
{ label: "金额1", prop: "reloriamt",rounding:this.rounding,headerAlign:"right",align:"right", width: "70px" }, { label: "金额1", prop: "reloriamt",rounding:this.rounding,headerAlign:"right",align:"right", width: "100px" },
{ label: "创建时间", prop: "inidattim", width: "100px" }, { label: "创建时间", prop: "inidattim", width: "100px" },
{ label: "签名要求", prop: "relreq", width: "100px" }, { label: "签名要求", prop: "relreq", width: "100px" },
{ label: "签名状态", prop: "relres", width: "100px" }, { label: "签名状态", prop: "relres", width: "100px" },
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
:key="key" :key="key"
:prop="item.prop" :prop="item.prop"
:label="item.label" :label="item.label"
:width="item.width" :min-width="item.width"
sortable sortable
> >
<template v-slot="{ scope }"> <template v-slot="{ scope }">
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
:key="key" :key="key"
:prop="item.prop" :prop="item.prop"
:label="item.label" :label="item.label"
:width="item.width" :min-width="item.width"
:formatter="item.rounding" :formatter="item.rounding"
sortable sortable
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
......
...@@ -137,9 +137,6 @@ ...@@ -137,9 +137,6 @@
</el-row> </el-row>
</template> </template>
</c-list-search> </c-list-search>
<c-col :span="24" style="">
<div style="border-bottom: 10px solid rgb(232, 232, 232)"></div>
</c-col>
<c-col :span="24" style="margin-top: 10px"> <c-col :span="24" style="margin-top: 10px">
<c-button <c-button
class="medium_bcs" class="medium_bcs"
......
...@@ -7,21 +7,36 @@ ...@@ -7,21 +7,36 @@
<c-col :span="24" style=""> <c-col :span="24" style="">
<c-col :span="8"> <c-col :span="8">
<el-form-item label="业务编号" prop="selobj" style="width: 100%"> <el-form-item label="业务编号" prop="selobj" style="width: 100%">
<c-input style="width: 100%" v-model="model.selobj" maxlength="32" placeholder="请输入业务编号"></c-input> <c-input
style="width: 100%"
v-model="model.selobj"
maxlength="32"
placeholder="请输入业务编号"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="创建时间" style="width: 100%"> <el-form-item label="创建时间" style="width: 100%">
<c-col :span="11"> <c-col :span="11">
<c-date-picker type="date" v-model="model.inidatfro" style="width: 100%" placeholder="请选择创建时间"> <c-date-picker
type="date"
v-model="model.inidatfro"
style="width: 100%"
placeholder="请选择创建时间"
>
</c-date-picker> </c-date-picker>
</c-col> </c-col>
<c-col :span="2" style="text-align: center"> <c-col :span="2" style="text-align: center">
<label style="display: inline-block; width: 100%">-</label> <label style="display: inline-block; width: 100%">-</label>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<c-date-picker type="date" v-model="model.inidattil" style="width: 100%" placeholder="请选择创建时间"> <c-date-picker
type="date"
v-model="model.inidattil"
style="width: 100%"
placeholder="请选择创建时间"
>
</c-date-picker> </c-date-picker>
</c-col> </c-col>
</el-form-item> </el-form-item>
...@@ -29,9 +44,21 @@ ...@@ -29,9 +44,21 @@
<c-col :span="8"> <c-col :span="8">
<el-form-item label="来源" style="width: 100%" prop="sourceModel"> <el-form-item label="来源" style="width: 100%" prop="sourceModel">
<el-select clearable v-model="sourceModel" style="width: 100%" placeholder="请选择来源" multiple collapse-tags <el-select
@change="sourceChangeEvent"> clearable
<el-option v-for="item in sourceData" :key="item.value" :label="item.label" :value="item.value"> v-model="sourceModel"
style="width: 100%"
placeholder="请选择来源"
multiple
collapse-tags
@change="sourceChangeEvent"
>
<el-option
v-for="item in sourceData"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -44,8 +71,17 @@ ...@@ -44,8 +71,17 @@
<c-col :span="8"> <c-col :span="8">
<el-form-item label="选择用户" prop="usfmod.flt" style="width: 100%"> <el-form-item label="选择用户" prop="usfmod.flt" style="width: 100%">
<!-- <c-col :span="20"> --> <!-- <c-col :span="20"> -->
<c-select v-model="model.usfmod.flt" style="width: 100%" placeholder="请选择选择用户"> <c-select
<el-option v-for="item in codes.flt" :key="item.value" :label="item.label" :value="item.value"> v-model="model.usfmod.flt"
style="width: 100%"
placeholder="请选择选择用户"
>
<el-option
v-for="item in codes.flt"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -53,13 +89,21 @@ ...@@ -53,13 +89,21 @@
<c-col :span="8"> <c-col :span="8">
<el-form-item label="业务描述" prop="seltxt" style="width: 100%"> <el-form-item label="业务描述" prop="seltxt" style="width: 100%">
<c-input v-model="model.seltxt" maxlength="32" placeholder="请输入业务描述"></c-input> <c-input
v-model="model.seltxt"
maxlength="32"
placeholder="请输入业务描述"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="业务标志" prop="dflg" style="width: 100%"> <el-form-item label="业务标志" prop="dflg" style="width: 100%">
<c-select v-model="model.dflg" style="width: 100%" placeholder="请选择国内国际标志"> <c-select
v-model="model.dflg"
style="width: 100%"
placeholder="请选择国内国际标志"
>
<el-option label="所有业务" value="1"></el-option> <el-option label="所有业务" value="1"></el-option>
<el-option label="国内业务" value="2"></el-option> <el-option label="国内业务" value="2"></el-option>
<el-option label="国际业务" value="3"></el-option> <el-option label="国际业务" value="3"></el-option>
...@@ -81,35 +125,54 @@ ...@@ -81,35 +125,54 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8" v-else> <c-col :span="8" v-else>
<el-form-item label="" style="width: 100%; height: 36.8px; margin: 0 0 0 0"> <el-form-item
label=""
style="width: 100%; height: 36.8px; margin: 0 0 0 0"
>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="16" style="text-align: right"> <c-col :span="16" style="text-align: right">
<el-button size="small" @click="handleReset">重置</el-button> <el-button size="small" @click="handleReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleSearch">查询</el-button> <el-button
type="primary"
icon="el-icon-search"
size="small"
@click="handleSearch"
>查询</el-button
>
</c-col> </c-col>
</c-col> </c-col>
</el-row> </el-row>
<c-col :span="24" style="">
<div style="border-bottom: 10px solid rgb(232, 232, 232)"></div>
</c-col>
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true"> <c-istream-table
<el-table-column fixed="right" prop="op" label="操作" width="250px" > :list="stmData.data"
:columns="stmData.columns"
:showButtonFlg="true"
>
<el-table-column fixed="right" prop="op" label="操作" width="250px">
<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">
<c-button style="margin-left: 0" size="small" @click="onDetails(scope.$index, scope.row)">详情 <c-button
style="margin-left: 0"
size="small"
@click="onDetails(scope.$index, scope.row)"
>详情
</c-button> </c-button>
<c-button style="margin-left: 5px" size="small" type="primary" @click="continueEdit(scope.row)">处理 <c-button
style="margin-left: 5px"
size="small"
type="primary"
@click="continueEdit(scope.row)"
>处理
</c-button> </c-button>
<!-- 更改按钮暂时隐藏 --> <!-- 更改按钮暂时隐藏 -->
<!-- <c-button style="margin-left: 5px" size="small" @click="onChange(scope.row)" :disabled="scope.row.状态!='INC'">更改 <!-- <c-button style="margin-left: 5px" size="small" @click="onChange(scope.row)" :disabled="scope.row.状态!='INC'">更改
</c-button> --> </c-button> -->
<el-popover placement="top-start" width="50" trigger="click"> <el-popover placement="top-start" width="50" trigger="click">
<ul class="table-button-item-list"> <ul class="table-button-item-list">
<li> <li>
<c-button size="small" style="margin-left: 0">指派</c-button> <c-button size="small" style="margin-left: 0">指派</c-button>
...@@ -118,7 +181,12 @@ ...@@ -118,7 +181,12 @@
<c-button size="small" style="margin-left: 0">删除</c-button> <c-button size="small" style="margin-left: 0">删除</c-button>
</li> </li>
</ul> </ul>
<a slot="reference" href="javascript:void(0)" style="margin-left: 5px"><i class="el-icon-more"></i></a> <a
slot="reference"
href="javascript:void(0)"
style="margin-left: 5px"
><i class="el-icon-more"></i
></a>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
...@@ -165,8 +233,7 @@ export default { ...@@ -165,8 +233,7 @@ export default {
'6 2 "交易名称" 150', '6 2 "交易名称" 150',
'5 3 "业务摘要" 300', '5 3 "业务摘要" 300',
'8 4 "创建人" 100',
'8 4 "创建人" 100',
// '7 7 "创建时间" 160 20 DateTime 1', // '7 7 "创建时间" 160 20 DateTime 1',
{ {
index: 7, index: 7,
...@@ -176,7 +243,6 @@ export default { ...@@ -176,7 +243,6 @@ export default {
label: "创建时间", label: "创建时间",
}, },
//'1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA', //'1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
{ {
index: 1, index: 1,
...@@ -250,7 +316,7 @@ export default { ...@@ -250,7 +316,7 @@ export default {
let datetime = new Date(); let datetime = new Date();
datetime = datetime.setDate(datetime.getDate() - 10); datetime = datetime.setDate(datetime.getDate() - 10);
this.model.inidatfro = new Date(datetime); this.model.inidatfro = new Date(datetime);
} },
}, },
created: function () { created: function () {
// this.setColumn = this.stmData.columns.map((item, index) => { // this.setColumn = this.stmData.columns.map((item, index) => {
......
...@@ -41,11 +41,7 @@ ...@@ -41,11 +41,7 @@
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item label="选择用户" prop="usfmod.flt" style="width: 100%">
label="选择用户"
prop="usfmod.flt"
style="width: 100%"
>
<!-- <c-col :span="20"> --> <!-- <c-col :span="20"> -->
<c-select <c-select
v-model="model.usfmod.flt" v-model="model.usfmod.flt"
...@@ -97,9 +93,7 @@ ...@@ -97,9 +93,7 @@
v-model="model.usfmod.usr.extkey" v-model="model.usfmod.usr.extkey"
maxlength="120" maxlength="120"
placeholder="请输入经办柜员" placeholder="请输入经办柜员"
@keyup.enter.native=" @keyup.enter.native="showGridPromptDialog('usfmod.usr.extkey')"
showGridPromptDialog('usfmod.usr.extkey')
"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -120,7 +114,11 @@ ...@@ -120,7 +114,11 @@
> >
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24" style="text-align: right;height:36.8px" v-if="model.usfmod.flt === '<SELU>'||model.usfmod.flt === '<SELB>'"> <c-col
:span="24"
style="text-align: right; height: 36.8px"
v-if="model.usfmod.flt === '<SELU>' || model.usfmod.flt === '<SELB>'"
>
<el-button size="small" @click="sptfndHandleReset">重置</el-button> <el-button size="small" @click="sptfndHandleReset">重置</el-button>
<el-button <el-button
type="primary" type="primary"
...@@ -130,17 +128,20 @@ ...@@ -130,17 +128,20 @@
>查询</el-button >查询</el-button
> >
</c-col> </c-col>
<c-col :span="24" style="">
</c-col>
</el-row> </el-row>
<el-row> <el-row>
<c-col :span="24" style=""> <c-col :span="24" style="">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true"> <c-istream-table
:list="stmData.data"
:columns="stmData.columns"
:showButtonFlg="true"
>
<el-table-column fixed="right" prop="op" label="操作" width="140px"> <el-table-column fixed="right" prop="op" label="操作" width="140px">
<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">
<c-button <c-button
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
style="margin-left: 5px" style="margin-left: 5px"
size="small" size="small"
type="primary" type="primary"
@click="onDelete(scope.$index,scope.row)" @click="onDelete(scope.$index, scope.row)"
> >
删除 删除
</c-button> </c-button>
...@@ -199,11 +200,24 @@ export default { ...@@ -199,11 +200,24 @@ export default {
'5 3 "业务编号" 300', '5 3 "业务编号" 300',
'6 2 "交易名称" 180', '6 2 "交易名称" 180',
// '1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA', // '1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
{index:1,position:4,width:100,pattern:'code',label:'状态',code:[{label:"待定",value:"PEN"}]}, {
index: 1,
position: 4,
width: 100,
pattern: "code",
label: "状态",
code: [{ label: "待定", value: "PEN" }],
},
'17 5 "报文类型" 100', '17 5 "报文类型" 100',
'18 6 "对方银行BIC" 130', '18 6 "对方银行BIC" 130',
// '7 7 "创建时间" 160 20 DateTime 1', // '7 7 "创建时间" 160 20 DateTime 1',
{index:7,position:7,width:140,pattern:'time',label:'创建时间'}, {
index: 7,
position: 7,
width: 140,
pattern: "time",
label: "创建时间",
},
'19 8 "币种" 70', '19 8 "币种" 70',
'20 9 "金额" 69 2 8 1 16', '20 9 "金额" 69 2 8 1 16',
......
...@@ -19,7 +19,11 @@ ...@@ -19,7 +19,11 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="创建时间" style="width: 100%" prop="trncorco.inidatfro"> <el-form-item
label="创建时间"
style="width: 100%"
prop="trncorco.inidatfro"
>
<c-col :span="11"> <c-col :span="11">
<c-date-picker <c-date-picker
type="date" type="date"
...@@ -189,13 +193,14 @@ ...@@ -189,13 +193,14 @@
</c-col> </c-col>
</el-row> </el-row>
<c-col :span="24" style="">
<div style="border-bottom: 10px solid rgb(232, 232, 232)">
</div>
</c-col>
<el-row> <el-row>
<c-col :span="24" style=""> <c-col :span="24" style="">
<c-istream-table :list="stmData.data" :columns="stmData.columns" style="width:100%" :showButtonFlg="true"> <c-istream-table
:list="stmData.data"
:columns="stmData.columns"
style="width: 100%"
:showButtonFlg="true"
>
<el-table-column <el-table-column
fixed="right" fixed="right"
prop="display" prop="display"
...@@ -203,14 +208,16 @@ ...@@ -203,14 +208,16 @@
width="140px" width="140px"
> >
<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
>
<!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> --> <!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
@click="onFinishDetail(scope.$index,scope.row)" @click="onFinishDetail(scope.$index, scope.row)"
> >
详情 详情
</c-button> </c-button>
...@@ -219,18 +226,12 @@ ...@@ -219,18 +226,12 @@
快照 快照
</c-button> </c-button>
--> -->
<c-button <c-button style="margin-left: 5px" size="small"> 冲正 </c-button>
style="margin-left: 5px"
size="small"
>
冲正
</c-button>
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
</el-row> </el-row>
</div> </div>
</template> </template>
<script> <script>
...@@ -263,13 +264,28 @@ export default { ...@@ -263,13 +264,28 @@ export default {
'12 4 "币种" 70', '12 4 "币种" 70',
'13 5 "金额" 100', '13 5 "金额" 100',
// '14 6 "创建时间" 170', // '14 6 "创建时间" 170',
{index:14,position:6,width:140,pattern:'time',label:'创建时间'}, {
index: 14,
position: 6,
width: 140,
pattern: "time",
label: "创建时间",
},
'9 7 "签名要求" 100', '9 7 "签名要求" 100',
'2 8 "签名状态" 100', '2 8 "签名状态" 100',
'16 9 "经办柜员" 100', '16 9 "经办柜员" 100',
// '0 10 "业务状态" 80', // '0 10 "业务状态" 80',
{index:0,position:10,width:100,pattern:'code',label:'业务状态',code:[{ label: "Final", value: "F" }, {
{ label: "Released", value: "R" },]}, index: 0,
position: 10,
width: 100,
pattern: "code",
label: "业务状态",
code: [
{ label: "Final", value: "F" },
{ label: "Released", value: "R" },
],
},
'15 11 "业务机构" 200', '15 11 "业务机构" 200',
], ],
data: [], data: [],
...@@ -289,11 +305,11 @@ export default { ...@@ -289,11 +305,11 @@ export default {
// return this.multipleSelection.map((idx) => this.stmData.data[idx]); // return this.multipleSelection.map((idx) => this.stmData.data[idx]);
// }, // },
...Event, ...Event,
getInidatfro(){ getInidatfro() {
let datetime = new Date(); let datetime = new Date();
datetime = datetime.setDate(datetime.getDate() - 1); datetime = datetime.setDate(datetime.getDate() - 1);
this.model.trncorco.inidatfro = new Date(datetime); this.model.trncorco.inidatfro = new Date(datetime);
} },
}, },
created: function () { created: function () {
this.getInidatfro(); this.getInidatfro();
......
...@@ -82,6 +82,7 @@ export default { ...@@ -82,6 +82,7 @@ export default {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
height: 100%;
} }
.scroll-container >>> .el-scrollbar__bar { .scroll-container >>> .el-scrollbar__bar {
bottom: 0px; bottom: 0px;
......
...@@ -11,10 +11,7 @@ ...@@ -11,10 +11,7 @@
> >
<c-col :span="8"> <c-col :span="8">
<el-form-item label="业务主表"> <el-form-item label="业务主表">
<c-input <c-input v-model="xxd" placeholder="请输入业务主表"></c-input>
v-model="xxd"
placeholder="请输入业务主表"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
...@@ -45,34 +42,29 @@ ...@@ -45,34 +42,29 @@
> >
</c-col> </c-col>
<c-col :span="24" style="margin-top: 10px">
<div style="border-bottom: 10px solid rgb(232, 232, 232)"></div>
</c-col>
<div v-for="(item, idx) in compareData" :key="idx"> <div v-for="(item, idx) in compareData" :key="idx">
<c-col <c-col
:span="24" :span="24"
style="height: 24px; margin-top: 20px; margin-bottom: 5px" style="height: 24px; margin-top: 20px; margin-bottom: 5px"
> >
<c-col :span="12"> <c-col :span="12">
<el-form-item :label="item.bo" class="messageLabel"> <el-form-item :label="item.bo" class="messageLabel"> </el-form-item>
</el-form-item>
</c-col> </c-col>
<c-col <c-col
:span="12" :span="12"
style=" style="text-align: right; font-weight: bold; font-size: 12px"
text-align: right;
font-weight: bold;
font-size: 12px;
"
> >
<div v-if="showType == 0"> <div v-if="showType == 0">
<c-button @click="changeShowType(0)" type="primary">原始数据</c-button> <c-button @click="changeShowType(0)" type="primary"
>原始数据</c-button
>
<c-button @click="changeShowType(1)">对比结果</c-button> <c-button @click="changeShowType(1)">对比结果</c-button>
</div> </div>
<div v-else> <div v-else>
<c-button @click="changeShowType(0)">原始数据</c-button> <c-button @click="changeShowType(0)">原始数据</c-button>
<c-button @click="changeShowType(1)" type="primary">对比结果</c-button> <c-button @click="changeShowType(1)" type="primary"
>对比结果</c-button
>
</div> </div>
</c-col> </c-col>
</c-col> </c-col>
...@@ -109,7 +101,7 @@ ...@@ -109,7 +101,7 @@
</template> </template>
<script> <script>
import { max } from 'moment'; import { max } from "moment";
import { all } from "~/service/compare"; import { all } from "~/service/compare";
export default { export default {
...@@ -123,13 +115,13 @@ export default { ...@@ -123,13 +115,13 @@ export default {
xxd: "DID", xxd: "DID",
tdref: "KZ3500210535AA ", tdref: "KZ3500210535AA ",
newref: "KZ3500210549AA ", newref: "KZ3500210549AA ",
compareData:[], compareData: [],
DID_Data: { DID_Data: {
data: [], data: [],
columns: [], columns: [],
}, },
DID_high_columns: [], DID_high_columns: [],
maxColumnLength:{}, maxColumnLength: {},
showType: 1, //0:原始数据, 1:对比数据 showType: 1, //0:原始数据, 1:对比数据
}; };
}, },
...@@ -156,9 +148,11 @@ export default { ...@@ -156,9 +148,11 @@ export default {
const key = res[i].allKeys[j]; const key = res[i].allKeys[j];
ret[key] = key.length; ret[key] = key.length;
for (let k = 0; k < res[i].diffRows.length; k++) { for (let k = 0; k < res[i].diffRows.length; k++) {
var current_length = res[i].diffRows[k].data[key] ? (res[i].diffRows[k].data[key] + '').trim().length : 0; var current_length = res[i].diffRows[k].data[key]
? (res[i].diffRows[k].data[key] + "").trim().length
: 0;
var current_max = ret[key] ? ret[key] : 0; var current_max = ret[key] ? ret[key] : 0;
if(current_length >= current_max){ if (current_length >= current_max) {
ret[key] = current_length; ret[key] = current_length;
} }
} }
...@@ -168,9 +162,9 @@ export default { ...@@ -168,9 +162,9 @@ export default {
console.log(this.maxColumnLength); console.log(this.maxColumnLength);
}); });
}, },
changeShowType(key){ changeShowType(key) {
this.showType = key; this.showType = key;
} },
}, },
components: {}, components: {},
}; };
......
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