修改bug

This commit is contained in:
‘937886381’
2024-07-26 17:03:09 +08:00
parent 4d8300d213
commit eda007d713
9 changed files with 43 additions and 29 deletions

View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-07-26 11:14:37
* @LastEditTime: 2024-07-26 14:28:19
* @LastEditors: zhp
* @Description:
-->
@@ -30,8 +30,8 @@
</el-form-item>
</el-form>
<!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
:max-height="tableH">
<base-table :row-key="(record, index) => { return record.in }" border :table-props="tableProps"
:page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData" :max-height="tableH">
<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
:method-list="tableBtn" @clickBtn="handleClick" /> -->
</base-table>
@@ -69,13 +69,13 @@ import basicPage from '@/mixins/basic-page'
import { getBaseHeader } from "@/utils/request";
import { factoryList } from "@/utils/constants";
import tableHeightMixin from "@/mixins/tableHeightMixin";
// import tableHeightMixin from "@/mixins/tableHeightMixin";
// import FileSaver from 'file-saver'
// import * as XLSX from 'xlsx'
export default {
// components: { ButtonNav, detailOrUpdate, addOrUpdate },
mixins: [basicPage, tableHeightMixin],
mixins: [basicPage],
data() {
const currentYear = new Date().getFullYear();
const startYear = currentYear - 10;
@@ -100,6 +100,7 @@ export default {
end: undefined,
// selectedValues: [],
options,
tableH: this.tableHeight(300),
listQuery: {
pageSize: 20,
pageNo: 1,
@@ -282,7 +283,7 @@ export default {
showOverflowtooltip: true
},
{
prop: 'CMaterial',
prop: 'material',
label: '子项物料名称',
minWidth: 150,
// filter: (val) => factoryList[val],
@@ -406,8 +407,10 @@ export default {
await getCostMainPage(this.listQuery).then(res => {
if (res.code === 0) {
// this.tableData = res.data.list
res.data.list.forEach(item => {
res.data.list.forEach((item, index) => {
let obj = {
in: Math.random().toString().slice(2, 10),
id:item.id,
yearPhase: item.yearPhase,
center: item.center,
product: item.product,
@@ -429,12 +432,15 @@ export default {
createTime: item.createTime,
yearPhaseName: item.yearPhaseName,
project: item.project,
CMaterial: item.material,
material: item.material,
children:[]
}
this.tableData.push(obj)
item.children.forEach(ele => {
item.children.forEach((ele, ind) => {
// for (let i in item.projs) {
let obj = {
in: Math.random().toString().slice(2, 10),
id: ele.id,
yearPhase: ele.yearPhase,
center: ele.center,
product: ele.product,
@@ -456,12 +462,15 @@ export default {
createTime: ele.createTime,
yearPhaseName: ele.yearPhaseName,
project: ele.project,
CMaterial: ele.material,
material: ele.material,
children:[]
}
this.tableData.push(obj)
ele.children?.forEach(i => {
this.tableData[index].children.push(obj)
ele.children?.forEach((i,inde) => {
// for (let i in item.projs) {
let obj = {
in: Math.random().toString().slice(2, 10),
id: i.id,
yearPhase: i.yearPhase,
center: i.center,
product: i.product,
@@ -483,9 +492,9 @@ export default {
createTime: i.createTime,
yearPhaseName: i.yearPhaseName,
project: i.project,
CMaterial: i.material,
material: i.material,
}
this.tableData.push(obj)
this.tableData[index].children[ind].children.push(obj)
// });
// }
});
@@ -494,6 +503,7 @@ export default {
});
});
console.log(this.tableData);
this.listQuery.total = res.data.total
}
})