Commit 92c798fe by 米嘉伟

表格细节调整,展示优化

parent 806b2d0a
...@@ -1418,4 +1418,7 @@ export default { ...@@ -1418,4 +1418,7 @@ export default {
} }
} }
} }
/deep/.el-table--enable-row-transition .el-table__body td.el-table__cell {
height: 55px;
}
</style> </style>
...@@ -999,4 +999,7 @@ export default { ...@@ -999,4 +999,7 @@ export default {
background-repeat: no-repeat; background-repeat: no-repeat;
transform: rotate(180deg) !important; transform: rotate(180deg) !important;
} }
.el-table tr {
height: 55px;
}
</style> </style>
...@@ -1209,40 +1209,6 @@ export default { ...@@ -1209,40 +1209,6 @@ export default {
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.el-message-box__message {
margin: 23px 24px 17px 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.el-message-box__btns {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
margin-right: 23%;
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
}
.el-button:nth-child(2) {
float: left;
margin-left: 23%;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
}
.el-popconfirm__main { .el-popconfirm__main {
margin: 23px 24px 17px 24px; margin: 23px 24px 17px 24px;
font-size: 14px; font-size: 14px;
...@@ -1545,4 +1511,7 @@ export default { ...@@ -1545,4 +1511,7 @@ export default {
} }
} }
} }
/deep/.el-table--enable-row-transition .el-table__body td.el-table__cell {
height: 55px;
}
</style> </style>
...@@ -1294,4 +1294,7 @@ const datas1 = [ ...@@ -1294,4 +1294,7 @@ const datas1 = [
} }
} }
} }
/deep/.el-table--enable-row-transition .el-table__body td.el-table__cell {
height: 55px;
}
</style> </style>
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
style="width: 100%" style="width: 100%"
row-key="nx" row-key="nx"
:tree-props="{children: 'sonBarcode', hasChildren: 'hasChildren'}" :tree-props="{children: 'sonBarcode', hasChildren: 'hasChildren'}"
default-expand-all
> >
<el-table-column <el-table-column
type="selection" type="selection"
...@@ -138,11 +137,11 @@ ...@@ -138,11 +137,11 @@
height="550" height="550"
:data="selectArr" :data="selectArr"
ref="selection" ref="selection"
@selection-change="checkRightAll"
style="width: 100%" style="width: 100%"
row-key="nx" row-key="nx"
:tree-props="{children: 'sonBarcode', hasChildren: 'hasChildren'}" :tree-props="{children: 'sonBarcode'}"
default-expand-all default-expand-all
@selection-change="checkRightAll"
> >
<el-table-column <el-table-column
type="selection" type="selection"
...@@ -441,7 +440,7 @@ export default { ...@@ -441,7 +440,7 @@ export default {
successCount: 0, // 成功条数 successCount: 0, // 成功条数
failCount: 0, // 失败条数 failCount: 0, // 失败条数
barcode: null, barcode: null,
fptxWidth1: 60, fptxWidth1: 50,
fptxWidth2: 120, fptxWidth2: 120,
fptxWidth3: 100, fptxWidth3: 100,
action: '', action: '',
...@@ -620,11 +619,12 @@ export default { ...@@ -620,11 +619,12 @@ export default {
} }
// 获取文件夹 // 获取文件夹
var folder = fileList[0].raw.webkitRelativePath.split("/"); // var folder = fileList[0].raw.webkitRelativePath.split("/");
// console.log('fffff', folder[0]) // console.log('fffff', folder[0])
let that = this; let that = this;
let newlist = fileList; let newlist = fileList;
for (let i = 0; i < fileList.length; i++) { for (let i = 0; i < fileList.length; i++) {
let fatherId = (i + 1);
let file = fileList[i].raw let file = fileList[i].raw
// console.log(file.webkitRelativePath, 999) // console.log(file.webkitRelativePath, 999)
// 读取文件 // 读取文件
...@@ -652,14 +652,14 @@ export default { ...@@ -652,14 +652,14 @@ export default {
const reg1 = /\<ysxt_asjxgrybh\>(.*?)\<\/ysxt_asjxgrybh\>/ const reg1 = /\<ysxt_asjxgrybh\>(.*?)\<\/ysxt_asjxgrybh\>/
newBarcode = barcode[i].match(reg1) newBarcode = barcode[i].match(reg1)
console.log(newBarcode, '单条') console.log(newBarcode, '单条')
sonBarcodeOlny.nx = (i + 1) sonBarcodeOlny.nx = fatherId + '' + (i + 1)
sonBarcodeOlny.barcode = newBarcode[1] sonBarcodeOlny.barcode = newBarcode[1]
sonBarcode.push(sonBarcodeOlny) sonBarcode.push(sonBarcodeOlny)
// that.$set(newlist[i], 'nx', i + 1) // that.$set(newlist[i], 'nx', i + 1)
// that.$set(newlist[i], 'barcode', newBarcode[1]) // that.$set(newlist[i], 'barcode', newBarcode[1])
} }
// that.$set(newlist[i], 'barcode', barcode[1]) // that.$set(newlist[i], 'barcode', barcode[1])
that.$set(newlist[i], 'wjxh', i + 1) that.$set(newlist[i], 'wjxh', fatherId)
that.$set(newlist[i], 'sonBarcode', sonBarcode) that.$set(newlist[i], 'sonBarcode', sonBarcode)
console.log(newlist[i], 'ajdhsajgguifhh 内序') console.log(newlist[i], 'ajdhsajgguifhh 内序')
} }
...@@ -683,11 +683,11 @@ export default { ...@@ -683,11 +683,11 @@ export default {
} }
const reg1 = /\<ysxt_asjbh\>(.*?)\<\/ysxt_asjbh\>/ const reg1 = /\<ysxt_asjbh\>(.*?)\<\/ysxt_asjbh\>/
newBarcode = barcode[i].match(reg1) newBarcode = barcode[i].match(reg1)
sonBarcodeOlny.nx = (i + 1) sonBarcodeOlny.nx = fatherId + '' + (i + 1)
sonBarcodeOlny.barcode = newBarcode[1] sonBarcodeOlny.barcode = newBarcode[1]
sonBarcode.push(sonBarcodeOlny) sonBarcode.push(sonBarcodeOlny)
} }
that.$set(newlist[i], 'wjxh', i + 1) that.$set(newlist[i], 'wjxh', fatherId)
that.$set(newlist[i], 'sonBarcode', sonBarcode) that.$set(newlist[i], 'sonBarcode', sonBarcode)
} }
// that.$set(newlist[i], 'barcode', barcode[1]) // that.$set(newlist[i], 'barcode', barcode[1])
......
...@@ -427,6 +427,7 @@ ...@@ -427,6 +427,7 @@
</div> </div>
<el-table <el-table
class="bzTable"
:class="{delSelection: !selectBoo}" :class="{delSelection: !selectBoo}"
v-if="showType == 2" v-if="showType == 2"
:max-height="height" :max-height="height"
...@@ -496,7 +497,7 @@ ...@@ -496,7 +497,7 @@
<el-table-column <el-table-column
prop="dataTypeName" prop="dataTypeName"
label="查询类型" label="查询类型"
:width="width4" :width="width3"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
...@@ -715,8 +716,8 @@ export default { ...@@ -715,8 +716,8 @@ export default {
width5: 50, width5: 50,
width4: 200, width4: 200,
width3: 100, width3: 100,
width2: 320, width2: 250,
width1: 300, width1: 250,
height: 460, height: 460,
dataType: null, // 导入类型 dataType: null, // 导入类型
barcode: "", // 条码号 barcode: "", // 条码号
...@@ -1629,5 +1630,17 @@ export default { ...@@ -1629,5 +1630,17 @@ export default {
background-repeat: no-repeat; background-repeat: no-repeat;
transform: rotate(180deg) !important; transform: rotate(180deg) !important;
} }
.el-table--enable-row-transition .el-table__body td.el-table__cell {
height: 55px;
}
.el-table__row {
height: 55px;
}
.bzTable.el-table--enable-row-transition .el-table__body td.el-table__cell {
height: 71px;
}
.bzTable.el-table__row {
height: 55px;
}
</style> </style>
...@@ -556,4 +556,7 @@ $tableHeight: var(--tableHeight, 550px); ...@@ -556,4 +556,7 @@ $tableHeight: var(--tableHeight, 550px);
} }
} }
} }
/deep/.el-table tr {
height: 55px;
}
</style> </style>
\ No newline at end of file
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