|
|
@@ -75,23 +75,45 @@
|
|
|
<el-button class="successBorder" @click="form_search('second')">查询</el-button>
|
|
|
<el-button class="export" style="float: right;margin-right: 5px;margin-top:10px;" icon="el-icon-upload2" @click="handleExport('tab2')">导出</el-button>
|
|
|
</div>
|
|
|
- <div v-if="tab2.table.tableConfig.length > 8">
|
|
|
- <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
|
|
|
+ <div v-if="tab2.table.tableConfig.length > 8">
|
|
|
+ <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
|
|
|
+ <!-- 第一个表头 -->
|
|
|
+ <u-table-column v-for="(header1, index1) in tab2.table.tableConfig" :key="'header1-' + index1" :label="header1.label" align="center" :fixed="index1==0" :show-overflow-tooltip="header1.showOverflow" >
|
|
|
+ <!-- 第二个表头 -->
|
|
|
+ <u-table-column v-for="(header2, index2) in header1.children" :key="'header2-' + index2" :label="header2.label" align="center" :fixed="index2==0" :show-overflow-tooltip="header2.showOverflow">
|
|
|
+ <!-- 第三个表头 -->
|
|
|
+ <u-table-column v-for="(header3, index3) in header2.children" :key="'header3-' + index3" :label="header3.label" :prop="header3.prop" align="center">
|
|
|
+ </u-table-column>
|
|
|
+ </u-table-column>
|
|
|
+ </u-table-column>
|
|
|
+ </u-table>
|
|
|
+ <!-- <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
|
|
|
<u-table-column v-for="(item,index) in tab2.table.tableConfig" :key="index" :label="item.label" :show-overflow-tooltip="item.showOverflow" :prop="item.prop" align="center" :fixed="index==0">
|
|
|
<u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" :label="item1.label" :prop="item1.prop" align="center">
|
|
|
<u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
|
|
|
</u-table-column>
|
|
|
</u-table-column>
|
|
|
- </u-table>
|
|
|
+ </u-table> -->
|
|
|
</div>
|
|
|
- <div v-else>
|
|
|
- <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
|
|
|
+ <div v-else>
|
|
|
+ <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
|
|
|
+ <!-- 第一个表头 -->
|
|
|
+ <u-table-column v-for="(header1, index1) in tab2.table.tableConfig" :key="'header1-' + index1" :label="header1.label" align="center" :fixed="index1==0" :show-overflow-tooltip="header1.showOverflow">
|
|
|
+ <!-- 第二个表头 -->
|
|
|
+ <u-table-column v-for="(header2, index2) in header1.children" :key="'header2-' + index2" :label="header2.label" align="center" :fixed="index2==0" :show-overflow-tooltip="header2.showOverflow">
|
|
|
+ <!-- 第三个表头 -->
|
|
|
+ <u-table-column v-for="(header3, index3) in header2.children" :key="'header3-' + index3" :label="header3.label" :prop="header3.prop" align="center">
|
|
|
+ </u-table-column>
|
|
|
+ </u-table-column>
|
|
|
+ </u-table-column>
|
|
|
+ </u-table>
|
|
|
+ <!-- <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
|
|
|
<u-table-column v-for="(item,index) in tab2.table.tableConfig" :key="index" :label="item.label" :show-overflow-tooltip="item.showOverflow" :prop="item.prop" align="center">
|
|
|
<u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" :label="item1.label" :prop="item1.prop" align="center">
|
|
|
<u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
|
|
|
</u-table-column>
|
|
|
</u-table-column>
|
|
|
- </u-table>
|
|
|
+ </u-table> -->
|
|
|
</div>
|
|
|
|
|
|
<span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
|
|
|
@@ -441,8 +463,11 @@ export default {
|
|
|
let myList = []
|
|
|
GetReportform(this.tab2.table.getdataListParm).then(response => {
|
|
|
if (response.data !== null && response.data.data !== null && response.data.data1 !== null) {
|
|
|
- this.tab2.table.data = response.data.data
|
|
|
- for (let i = 0; i < response.data.list.data2.length; i++) {
|
|
|
+ this.tab2.table.data = response.data.data
|
|
|
+ response.data.feedcode.push('')
|
|
|
+ response.data.feedcode.unshift('饲料编码')
|
|
|
+ for (let i = 0; i < response.data.list.data2.length; i++) {
|
|
|
+ console.log(response.data.list.data2[i],'===label')
|
|
|
for (let j = 0; j < response.data.list.data1.length; j++) {
|
|
|
for (let a = 0; a < response.data.list.data2[i].children.length; a++) {
|
|
|
if (response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == undefined || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == null || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == '') {
|
|
|
@@ -461,12 +486,29 @@ export default {
|
|
|
} else {
|
|
|
this.$set(response.data.list.data2[i].children[0], 'width', '80px')
|
|
|
}
|
|
|
+ }
|
|
|
+ let list = response.data.list.data2
|
|
|
+ let code = response.data.feedcode
|
|
|
+ const headers = []
|
|
|
+ for(let i=0;i<list.length;i++){
|
|
|
+ for(let j=0;j<code.length;j++){
|
|
|
+ if(i== j){
|
|
|
+ let obj = {
|
|
|
+ label:code[j],
|
|
|
+ children:[
|
|
|
+ list[i]
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ headers.push(obj)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
myList = response.data.list.data1
|
|
|
this.tab2.table.list = response.data.list.data1
|
|
|
- this.tab2.table.tableConfig = response.data.list.data2
|
|
|
+ this.tab2.table.tableConfig = headers
|
|
|
this.tab2.table.total = response.data.list.data1.length
|
|
|
console.log('库存统计-用料分析this.tab2.table.data', response.data.data)
|
|
|
+ console.log('库存统计-用料分析this.tab2.table.feedcode', response.data.feedcode)
|
|
|
console.log('库存统计-用料分析this.tab2.table.list', response.data.list.data1)
|
|
|
console.log('库存统计-用料分析this.tab2.table.tableConfig',response.data.list.data2)
|
|
|
} else {
|
|
|
@@ -804,24 +846,36 @@ export default {
|
|
|
var exportData = []
|
|
|
var exportTitle1 = [] // 一级标题
|
|
|
var exportTitle2 = [] // 二级标题
|
|
|
+ var exportTitle3 = [] // 一级标题
|
|
|
var filterValArr = []
|
|
|
for (let i = 0; i < this.tab2.table.tableConfig.length; i++) {
|
|
|
exportTitle1.push(this.tab2.table.tableConfig[i].label)
|
|
|
for (let j = 0; j < this.tab2.table.tableConfig[i].children.length; j++) {
|
|
|
- exportTitle2.push(this.tab2.table.tableConfig[i].children[j].label)
|
|
|
- filterValArr.push(this.tab2.table.tableConfig[i].children[j].prop)
|
|
|
+ exportTitle2.push(this.tab2.table.tableConfig[i].children[j].label)
|
|
|
+ for(let a = 0;a<this.tab2.table.tableConfig[i].children[j].children.length;a++){
|
|
|
+ exportTitle3.push(this.tab2.table.tableConfig[i].children[j].children[a].label)
|
|
|
+ filterValArr.push(this.tab2.table.tableConfig[i].children[j].children[a].prop)
|
|
|
+ }
|
|
|
+ // filterValArr.push(this.tab2.table.tableConfig[i].children[j].prop)
|
|
|
}
|
|
|
}
|
|
|
console.log('一级标题exportTitle1', exportTitle1)
|
|
|
console.log('二级标题exportTitle2', exportTitle2)
|
|
|
+ console.log('三级标题exportTitle3', exportTitle3)
|
|
|
console.log('对应字段filterValArr', filterValArr)
|
|
|
var headerArr = []// 处理一级标题
|
|
|
+ var headerArr2 = []// 处理一级标题
|
|
|
if (this.tab2.table.getdataListParm.checked == 1) {
|
|
|
for (let i = 0; i < exportTitle1.length; i++) {
|
|
|
if (i > 0) {
|
|
|
headerArr.push(exportTitle1[i], '', '', '')
|
|
|
} else {
|
|
|
headerArr.push(exportTitle1[i])
|
|
|
+ }
|
|
|
+ if (i > 0) {
|
|
|
+ headerArr2.push(exportTitle2[i], '', '', '')
|
|
|
+ } else {
|
|
|
+ headerArr2.push(exportTitle2[i])
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
@@ -831,10 +885,16 @@ export default {
|
|
|
headerArr.push(exportTitle1[i], '')
|
|
|
} else {
|
|
|
headerArr.push(exportTitle1[i])
|
|
|
+ }
|
|
|
+ if (i > 0) {
|
|
|
+ headerArr2.push(exportTitle2[i], '')
|
|
|
+ } else {
|
|
|
+ headerArr2.push(exportTitle2[i])
|
|
|
}
|
|
|
}
|
|
|
}else{
|
|
|
headerArr = exportTitle1
|
|
|
+ headerArr2 = exportTitle2
|
|
|
}
|
|
|
}
|
|
|
console.log('headerArr', headerArr)
|
|
|
@@ -845,8 +905,10 @@ export default {
|
|
|
const multiHeader = [
|
|
|
headerArr
|
|
|
]
|
|
|
- const multiHeader2 = []
|
|
|
- const tHeader = exportTitle2
|
|
|
+ const multiHeader2 = [
|
|
|
+ headerArr2
|
|
|
+ ]
|
|
|
+ const tHeader = exportTitle3
|
|
|
const filterVal = filterValArr
|
|
|
const data = this.tab2.table.list.map(v => filterVal.map(j => v[j]))
|
|
|
// const data = []
|
|
|
@@ -955,11 +1017,14 @@ export default {
|
|
|
}
|
|
|
// .el-radio{margin-right: 20px;}
|
|
|
</style>
|
|
|
-<style lang="css">
|
|
|
+<style lang="scss">
|
|
|
.el-tooltip__popper{
|
|
|
max-width: 60% !important;
|
|
|
}
|
|
|
.plTableBox .el-table td.is-hidden>*, .plTableBox .el-table th.is-hidden>*{
|
|
|
visibility:inherit;
|
|
|
+ }
|
|
|
+ .plTableBox .el-table th>.cell{
|
|
|
+ white-space: pre-wrap;
|
|
|
}
|
|
|
</style>
|
