Commit 68064ddc by li_hongchao

操作项下拉按钮的样式不太对,应该是内阴影;

战果状态图标样式保持一致,当前样式有误差;
地市/省厅审核列表的整理高度是不是可以再往下调整一 行,滚动条与下方的分割线并齐;
地市/省厅审核列表第一列与查询条件左侧不对齐问题
地市/省厅审核列表批量操作切换时,列表底部横向滚动条会消失问题
地市审核列表如果处于批量处理操作时,列表头部和内容显示错位问题
parent 69da340d
......@@ -145,13 +145,19 @@
@selection-change="handleSelectionChange">
<el-table-column type="selection" :reserve-selection="false"
:width="getSelectWidth()" fixed="left" />
:width="getSelectWidth()" />
<el-table-column v-if="BLANK.isShow === true" :width="BLANK.width" />
<div v-for="item in tableColumns">
<div>
<el-table-column v-if="BLANK.isShow === true" :width="BLANK.width" />
</div>
<div v-if="item.prop === 'sfjrzg'">
<el-table-column v-if="item.isShow" :prop="item.prop"
:label="item.label" width="auto" :min-width="item.width"
show-overflow-tooltip>
:label="item.label" :width="item.width">
<template slot-scope="scope">
<div v-if="scope.row.sfjrzg === '0'">
<span>不计战果</span>
......@@ -190,8 +196,7 @@
<div v-else-if="item.prop === 'shzt'">
<el-table-column v-if="item.isShow" :prop="item.prop"
:label="item.label" width="auto" :min-width="item.width"
show-overflow-tooltip>
:label="item.label" :width="item.width">
<template slot-scope="scope">
<div class="shzt">
<div v-if="getShState(scope.row) === SH_TYPE.FH.value" class="dsh">
......@@ -258,7 +263,7 @@
<div v-else-if="item.prop === 'sbdwGajgjgdmStr'">
<el-table-column v-if="item.isShow" :prop="item.prop"
:label="item.label" width="auto" :min-width="item.width">
:label="item.label" :width="item.width" show-overflow-tooltip>
<template slot-scope="scope">
<el-tooltip effect="dark" :content="scope.row.sbdwGajgjgdmStr"
placement="top" :open-delay="300">
......@@ -270,13 +275,11 @@
<div v-else>
<el-table-column v-if="item.isShow" :prop="item.prop"
:label="item.label" width="auto" :min-width="item.width"
show-overflow-tooltip />
:label="item.label" :width="item.width" />
</div>
</div>
<el-table-column prop="prop" label="操作" :width="czWidth" fixed="right"
style="background: white">
<el-table-column prop="prop" label="操作" width="auto" :min-width="czWidth" fixed="right">
<template slot-scope="scope">
<bzxxsf-opt :ref="getShxxOpt(scope.row.id)" :params="scope.row" :is-st="isStRole"
@refresh="bzxxsfOptRefresh"
......@@ -347,16 +350,18 @@ export default {
TAG: '比中信息审核-',
ruleForm: initRuleFrom,
YTMH: {width: '214', prop: 'ytmh', label: '源条码号', isShow: true},
MBTMH: {width: '214', prop: 'mbtmh', label: '目标条码号', isShow: true},
YZW: {width: '108', prop: 'yzw', label: '源指位/序号', isShow: true},
MBZW: {width: '112', prop: 'mbzw', label: '目标指位/序号', isShow: true},
SBDW: {width: '172', prop: 'sbdwGajgjgdmStr', label: '上报单位', isShow: true},
SBSJ: {width: '166', prop: 'sbsj', label: '上报时间', isShow: true},
SHR: {width: '96', prop: 'shrXm', label: '审核人', isShow: true},
SHSJ: {width: '115', prop: 'shsj', label: '审核时间', isShow: true},
ZGZT: {width: '114', prop: 'sfjrzg', label: '战果状态', isShow: true},
SHZT: {width: '130', prop: 'shzt', label: '审核状态', isShow: true},
BLANK: {width: '16', prop: '', label: '', isShow: true},
YTMH: {width: '210', prop: 'ytmh', label: '源条码号', isShow: true},
MBTMH: {width: '210', prop: 'mbtmh', label: '目标条码号', isShow: true},
YZW: {width: '102', prop: 'yzw', label: '源指位/序号', isShow: true},
MBZW: {width: '114', prop: 'mbzw', label: '目标指位/序号', isShow: true},
SBDW: {width: '166', prop: 'sbdwGajgjgdmStr', label: '上报单位', isShow: true},
SBSJ: {width: '162', prop: 'sbsj', label: '上报时间', isShow: true},
SHR: {width: '90', prop: 'shrXm', label: '审核人', isShow: true},
SHSJ: {width: '110', prop: 'shsj', label: '审核时间', isShow: true},
ZGZT: {width: '112', prop: 'sfjrzg', label: '战果状态', isShow: true},
SHZT: {width: '128', prop: 'shzt', label: '审核状态', isShow: true},
queryTypeBtns: [
{value: 2, name: '正查'},
......@@ -398,7 +403,7 @@ export default {
totalPage: 0, // 总共页数
tableDate: [],
tableHeight: '30rem',
tableHeight: '33.5rem',
selectwidth: 50,
czWidth: 160,
isStRole: false, // 用于标记是省厅角色还是地市角色
......@@ -425,6 +430,7 @@ export default {
tableColumns: [],
checkedProps: [],
dom: ''
}
},
components: {
......@@ -473,6 +479,7 @@ export default {
},
getSelectWidth() {
return this.isSelectBoo ? this.selectwidth : 1
// return this.selectwidth
},
getLable(label) {
return ZzjgUtil.last(label)
......@@ -518,6 +525,7 @@ export default {
// logger.info('tableColumns', _that.tableColumns)
},
changeCheckbox(val) {
logger.info('changeCheckbox', val)
let _that = this
_that.tableKey++
_that.tableColumns.filter(item => {
......@@ -643,6 +651,7 @@ export default {
batch() {
var _that = this
_that.isSelectBoo = !_that.isSelectBoo
// _that.tableColumns[0].isShow = !_that.tableColumns[0].isShow
if (!_that.isSelectBoo) {
_that.clearSelection()
}
......@@ -820,6 +829,12 @@ export default {
}
})
}
},
isSelectBoo() {
// this.BLANK.isShow = !this.isSelectBoo
this.BLANK.width = this.isSelectBoo ? '1' : '16'
this.tableHeight = this.isSelectBoo ? '30rem' : '33.5rem'
this.$forceUpdate()
}
},
}
......
......@@ -563,7 +563,7 @@
.is-error {
.el-input {
&::after {
display: block;
display: none;
content: "";
width: 16px;
height: 16px;
......
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