mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

Browse Source
This commit is contained in:
‘937886381’
2024-04-26 10:51:48 +08:00
parent b2304941a4 14b2a49053
commit 1537b1be58
7 changed files with 321 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/views/report/Product/monthly.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: Do not edit
* @Date: 2024-04-22 15:49:56
* @LastEditTime: 2024-04-25 14:30:44
* @LastEditTime: 2024-04-26 10:32:29
* @LastEditors: DY
* @Description:
-->
@@ -43,12 +43,16 @@
</el-button>
</el-form>
<base-table
ref="productionDataMonthTable11"
id="productionDataMonthTable1"
:table-props="tableProps"
:table-data="tableData"
:span-method="objectSpanMethod1"
@emitFun="handleEmitFun"
:max-height="tableH" />
<base-table
ref="productionDataMonthTable22"
id="productionDataMonthTable2"
:table-props="tableProps1"
:table-data="tableData1"
:span-method="objectSpanMethod1"
@@ -94,26 +98,47 @@ export default {
now.setHours(0, 0, 0, 0)
now.setDate(1)
let startOfMonth = now.getTime()
// let firstDayOfMonth = new Date(startOfMonth)
this.listQuery.time = startOfMonth
},
mounted() {
this.getList();
},
methods: {
getTime1() {
const firstDayOfMonth = new Date(this.listQuery.time)
const lastDayOfMonth = new Date(firstDayOfMonth.getFullYear(), firstDayOfMonth.getMonth() + 1, 0, 0, 0, 0, 0)
// console.log('时间', parseTime(firstDayOfMonth), parseTime(lastDayOfMonth))
this.$set(this.tableProps[2], 'label', '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')')
this.$set(this.tableProps1[2], 'label', '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')')
// this.tableProps[2].label = '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')'
// this.tableProps1[2].label = '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')'
console.log(this.tableProps, this.tableProps1)
},
async getList() {
const firstDayOfMonth = new Date(this.listQuery.time)
const lastDayOfMonth = new Date(firstDayOfMonth.getFullYear(), firstDayOfMonth.getMonth() + 1, 0, 0, 0, 0, 0)
this.tableData = [];
this.tableProps = [
{
prop: 'lineName',
label: '',
fixed: true,
width: 120,
'show-overflow-tooltip': true
},
{
prop: 'paramsName',
label: '',
fixed: true,
width: 120,
'show-overflow-tooltip': true
},
{
prop: 'xc',
label: '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')',
// align: 'center',
children: []
}
];
this.tableData1 = [];
this.tableProps1 = [
@@ -121,18 +146,28 @@ export default {
prop: 'lineName',
label: '',
fixed: true,
width: 120,
'show-overflow-tooltip': true
},
{
prop: 'paramsName',
label: '',
fixed: true,
width: 120,
'show-overflow-tooltip': true,
},
{
prop: 'xc1',
label: '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')',
// align: 'center',
children: []
}
];
await productionMonthY(this.listQuery).then((res) => {
this.resData = res.data;
// 设置表头
Object.keys(this.resData).forEach((item) => {
this.tableProps.push({
this.tableProps[2].children.push({
prop: item,
label: item,
'show-overflow-tooltip': true,
@@ -144,7 +179,7 @@ export default {
this.resData1 = res.data;
// 设置表头
Object.keys(this.resData1).forEach((item) => {
this.tableProps1.push({
this.tableProps1[2].children.push({
prop: item,
label: item,
'show-overflow-tooltip': true,
@@ -152,6 +187,7 @@ export default {
});
this.buildTableData1(this.resData1);
});
// this.getTime1()
},
// 设置表格2数据
buildTableData1(data) {
@@ -187,6 +223,9 @@ export default {
}
this.tableData1 = tempData;
this.getSpanArr1(this.tableData1);
this.$nextTick(() => {
this.reTable1();
});
},
// 设置表格数据
buildTableData(data) {
@@ -222,6 +261,15 @@ export default {
}
this.tableData = tempData;
this.getSpanArr(this.tableData);
this.$nextTick(() => {
this.reTable();
});
},
reTable() {
this.$refs.productionDataMonthTable11.doLayout('productionDataMonthTable1');
},
reTable1() {
this.$refs.productionDataMonthTable22.doLayout('productionDataMonthTable2');
},
getSpanArr1(data) {
this.span2 = [];

50
src/views/report/Product/year.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: Do not edit
* @Date: 2024-04-22 15:49:56
* @LastEditTime: 2024-04-25 11:14:34
* @LastEditTime: 2024-04-26 10:34:12
* @LastEditors: DY
* @Description:
-->
@@ -43,12 +43,16 @@
</el-button>
</el-form>
<base-table
ref="productionDataYearTable11"
id="productionDataYearTable1"
:table-props="tableProps"
:table-data="tableData"
:span-method="objectSpanMethod1"
@emitFun="handleEmitFun"
:max-height="tableH" />
<base-table
ref="productionDataYearTable22"
id="productionDataYearTable2"
:table-props="tableProps1"
:table-data="tableData1"
:span-method="objectSpanMethod1"
@@ -103,19 +107,39 @@ export default {
this.getList();
},
methods: {
getTime() {
const firstDayOfYear = new Date(this.listQuery.time)
const lastDayOfYear = new Date(firstDayOfYear.getFullYear() + 1, 0, 0, 0, 0, 0, 0)
// console.log('时间', parseTime(firstDayOfMonth), parseTime(lastDayOfMonth))
this.tableProps[0].label = '许昌安彩年原片生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')'
this.tableProps1[0].label = '许昌安彩年成品生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')'
},
async getList() {
// this.getTime()
const firstDayOfYear = new Date(this.listQuery.time)
const lastDayOfYear = new Date(firstDayOfYear.getFullYear() + 1, 0, 0, 0, 0, 0, 0)
this.tableData = [];
this.tableProps = [
{
prop: 'lineName',
label: '',
fixed: true,
width: 120,
'show-overflow-tooltip': true
},
{
prop: 'paramsName',
label: '',
fixed: true,
width: 120,
'show-overflow-tooltip': true
},
{
prop: 'xc',
label: '许昌安彩年原片生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')',
// align: 'center',
children: []
}
];
this.tableData1 = [];
this.tableProps1 = [
@@ -123,18 +147,26 @@ export default {
prop: 'lineName',
label: '',
fixed: true,
'show-overflow-tooltip': true
},
{
prop: 'paramsName',
label: '',
fixed: true,
'show-overflow-tooltip': true
},
{
prop: 'xc1',
label: '许昌安彩年成品生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')',
// align: 'center',
children: []
}
];
await productionYearY(this.listQuery).then((res) => {
this.resData = res.data;
// 设置表头
Object.keys(this.resData).forEach((item) => {
this.tableProps.push({
this.tableProps[2].children.push({
prop: item,
label: item,
'show-overflow-tooltip': true,
@@ -146,7 +178,7 @@ export default {
this.resData1 = res.data;
// 设置表头
Object.keys(this.resData1).forEach((item) => {
this.tableProps1.push({
this.tableProps1[2].children.push({
prop: item,
label: item,
'show-overflow-tooltip': true,
@@ -189,6 +221,9 @@ export default {
}
this.tableData1 = tempData;
this.getSpanArr1(this.tableData1);
this.$nextTick(() => {
this.reTable1();
});
},
// 设置表格数据
buildTableData(data) {
@@ -224,6 +259,15 @@ export default {
}
this.tableData = tempData;
this.getSpanArr(this.tableData);
this.$nextTick(() => {
this.reTable();
});
},
reTable() {
this.$refs.productionDataYearTable11.doLayout('productionDataYearTable1');
},
reTable1() {
this.$refs.productionDataYearTable22.doLayout('productionDataYearTable2');
},
getSpanArr1(data) {
this.span2 = [];