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

projects/mesxc-dy #361

Merged
juzi merged 2 commits from projects/mesxc-dy into projects/mesxc-test 2024-04-25 08:42:57 +08:00
Conversation 0 Commits 2 Files Changed 7 +253 -109
7 changed files with 253 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 61567ce86a - Show all commits

38
src/api/report/glass.js
View File

@@ -1,7 +1,7 @@
/*
* @Author: Do not edit
* @Date: 2023-12-08 10:26:48
* @LastEditTime: 2023-12-13 17:16:00
* @LastEditTime: 2024-04-24 16:31:37
* @LastEditors: DY
* @Description:
*/
@@ -59,3 +59,39 @@ export function exportGlasscExcel(query) {
responseType: 'blob'
})
}
// 生产月报查询--冷端生产线
export function productionMonthY(data) {
return request({
url: '/extend/customized-reports/productionMonthY',
method: 'post',
data: data
})
}
// 生产月报查询--深加工生产线
export function productionMonthD(data) {
return request({
url: '/extend/customized-reports/productionMonthD',
method: 'post',
data: data
})
}
// 生产年报查询--冷端生产线
export function productionYearY(data) {
return request({
url: '/extend/customized-reports/productionYearY',
method: 'post',
data: data
})
}
// 生产年报查询--冷端生产线
export function productionYearD(data) {
return request({
url: '/extend/customized-reports/productionYearD',
method: 'post',
data: data
})
}

233
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-23 17:06:16
* @LastEditTime: 2024-04-25 08:39:13
* @LastEditors: DY
* @Description:
-->
@@ -9,115 +9,176 @@
<div class="weekly">
<el-form :inline="true" :model="listQuery" class="blueTip">
<el-form-item label="月" prop="reportTime">
<el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
<el-date-picker v-model="listQuery.time" value-format="yyyy-MM-dd HH:mm:ss" type="month" size="small" placeholder="选择月">
</el-date-picker>
</el-form-item>
<el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" @click="search()">
<el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" @click="getList">
查询
</el-button>
<el-button v-if="this.$auth.hasPermiAnd(['base:report-auto-original-glass:export', 'base:report-auto-production:export'])" type="primary" size="small" plain
@click="handleExport">导出</el-button>
</el-form>
<monthWeek v-if="glassWeekShow" ref="monthWeek" :product="false" :params="listQuery" />
<proMonth v-if="proWeekShow" ref="proMonth" :product="false" :params="listQuery" />
<base-table
:table-props="tableProps"
:table-data="tableData"
:span-method="mergeColumnHandler"
@emitFun="handleEmitFun"
:max-height="tableH"
/>
<!-- <monthWeek v-if="glassWeekShow" ref="monthWeek" :product="false" :params="listQuery" />
<proMonth v-if="proWeekShow" ref="proMonth" :product="false" :params="listQuery" /> -->
</div>
</template>
<script>
import monthWeek from '../glass/month.vue'
import proMonth from '../productionMonthReport/index.vue'
import { parseTime } from '../../core/mixins/code-filter';
// import monthWeek from '../glass/month.vue'
// import proMonth from '../productionMonthReport/index.vue'
import { productionMonthY } from '@/api/report/glass';
import { parseTime } from '../../core/mixins/code-filter'
import FileSaver from 'file-saver'
import * as XLSX from 'xlsx/xlsx.mjs'
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default {
components: { monthWeek, proMonth },
// components: { monthWeek, proMonth },
mixins: [tableHeightMixin],
data() {
return {
heightNum: 240,
listQuery: {
// pageSize: 10,
// pageNo: 1,
// total: 0,
reportType: 4,
reportTime: []
time: parseTime(new Date())
},
startTimeStamp: '',
endTimeStamp: '',
reportTime: '',
glassWeekShow: false,
proWeekShow: false
// startTimeStamp: '',
// endTimeStamp: '',
// reportTime: '',
// glassWeekShow: false,
// proWeekShow: false,
tableData: [],
tableProps: [
{
prop: 'lineName',
label: ''
},
{
prop: 'paramsName',
label: ''
}
],
resData: []
}
},
created() {
this.getCurrentMonthFirst()
this.glassWeekShow = true
this.proWeekShow = true
// this.getCurrentMonthFirst()
// this.glassWeekShow = true
// this.proWeekShow = true
},
mounted() {
this.getList()
},
methods: {
getCurrentMonthFirst() {
const date = new Date();
date.setDate(1);
this.reportTime = date
// console.log(date)
this.changeTime(date)
// console.log(date.valueOf());
/** 合并table列的规则 */
mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
// if (columnIndex == 0 || columnIndex == 1) {
// if (this.spanInfo[rowIndex]) {
// return [
// this.spanInfo[rowIndex], // row span
// 1, // col span
// ];
// } else {
// return [0, 0];
// }
// }
},
async getList() {
this.tableData = []
this.tableProps = [
{
prop: 'lineName',
label: ''
},
{
prop: 'paramsName',
label: ''
}
]
await productionMonthY(this.listQuery).then(res => {
this.resData = res.data
// 设置表头
Object.keys(this.resData).forEach(item => {
this.tableProps.push({
prop: item,
label: item,
'show-overflow-tooltip': true
})
})
this.buildTableData()
})
},
// 设置表格数据
buildTableData() {
const temp = Object.values(this.resData)
console.log('temp', temp)
const dataArray = []
// Object.entries(this.resData).forEach(en => {
// console.log('你好', en)
// const date = en[0]
// let valueArray = []
// Object.entries(en[1]).forEach((values, sequence) => {
// let yValue = {}
// yValue['line'] = values[0]
// Object.entries(values[1]).forEach((lastV, index) => {
// console.log(lastV)
// const tempValue = {}
// if (values[0] === yValue['line']) {
// tempValue[values[0]] = lastV[1]
// }
// valueArray.push(tempValue)
// })
// yValue[date+'-'+sequence] = valueArray
// dataArray.push(yValue)
// })
// })
// for (let key in temp) {
// console.log('你好', temp[key])
// }
// 产线
Object.keys(temp[0]).forEach(item => {
// 规格循环
Object.keys(Object.values(temp[0])[0]).forEach(it => {
const row = {
lineName: item,
paramsName: it
}
this.tableData.push(row)
})
})
},
handleExport() {
this.$nextTick(() => {
this.$refs['monthWeek'].handleExport()
this.$refs['proMonth'].handleExport()
})
const xlsxParam = { raw: true }
let workbook = XLSX.utils.book_new()
var ws = XLSX.utils.table_to_sheet( document.querySelector('#exportTable'), xlsxParam)
XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩月原片生产汇总')
var prows = XLSX.utils.table_to_sheet( document.querySelector('#exportproductionTable'), xlsxParam)
XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩月成品生产汇总')
let fileName = '生产数据汇总表-月报.xlsx';
var wbout = XLSX.write(workbook, {
bookType: 'xlsx',
bookSST: true,
type: 'array',
});
try {
FileSaver.saveAs(
new Blob([wbout], { type: 'application/octet-stream' }),
fileName
);
this.$message.success('导出成功');
} catch (e) {
if (typeof console !== 'undefined') console.log(e, wbout);
}
return wbout;
},
search() {
this.$nextTick(() => {
this.$refs['monthWeek'].getDataList()
this.$refs['proMonth'].getDataList()
})
},
changeTime(val) {
console.log(val)
if(val) {
const timeStamp = val.getMonth(); //标准时间转为时间戳，毫秒级别
const fullyear = val.getFullYear()
let days = 0
switch (timeStamp) {
case 0:
case 2:
case 4:
case 6:
case 7:
case 9:
case 11:
days = 31
break
case 3:
case 4:
case 8:
case 10:
days = 30
break
case 1:
if ((fullyear % 400 === 0) || (fullyear % 4 === 0 && fullyear % 100 !== 0)) {
days = 29
} else {
days = 28
}
break
}
this.startTimeStamp = this.timeFun(new Date(fullyear, timeStamp, 1, 7, 0, 1).getTime()); //开始时间
this.endTimeStamp = this.timeFun(new Date(fullyear, timeStamp, days, 7, 0, 0).getTime()); //结束时间
console.log(this.startTimeStamp, this.endTimeStamp)
this.listQuery.reportTime[0] = parseTime(new Date(fullyear, timeStamp, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
this.listQuery.reportTime[1] = parseTime(new Date(fullyear, timeStamp, days, 7, 0, 0).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
} else {
this.listQuery.reportTime = []
}
},
//时间戳转为yy-mm-dd hh:mm:ss
timeFun(unixtimestamp) {
var unixtimestamp = new Date(unixtimestamp);
var year = 1900 + unixtimestamp.getYear();
var month = "0" + (unixtimestamp.getMonth() + 1);
var date = "0" + unixtimestamp.getDate();
return year + "-" + month.substring(month.length - 2, month.length) + "-" + date.substring(date.length - 2, date.length)
handleEmitFun(payload) {
console.log('payload', payload);
}
}
}
@@ -125,7 +186,7 @@ export default {
<style scoped>
.weekly {
padding-top: 16px;
padding: 16px;
}
.blueTip::before{
display: inline-block;

41
src/views/report/Product/weekly.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: Do not edit
* @Date: 2024-04-22 15:49:56
* @LastEditTime: 2024-04-23 15:43:36
* @LastEditTime: 2024-04-24 15:28:44
* @LastEditors: DY
* @Description:
-->
@@ -28,7 +28,9 @@
<script>
import glassWeek from '../glass/weekly.vue'
import proWeek from '../productionWeekReport/index.vue'
import { parseTime } from '../../core/mixins/code-filter';
import { parseTime } from '../../core/mixins/code-filter'
import FileSaver from 'file-saver'
import * as XLSX from 'xlsx/xlsx.mjs'
export default {
components: { glassWeek, proWeek },
@@ -45,7 +47,8 @@ export default {
endTimeStamp: '',
reportTime: '',
glassWeekShow: false,
proWeekShow: false
proWeekShow: false,
proTabaleData: []
}
},
created() {
@@ -54,11 +57,35 @@ export default {
this.proWeekShow = true
},
methods: {
// handleExport() {
// this.$nextTick(() => {
// this.$refs['glassWeek'].handleExport()
// this.$refs['proWeek'].handleExport()
// })
// },
handleExport() {
this.$nextTick(() => {
this.$refs['glassWeek'].handleExport()
this.$refs['proWeek'].handleExport()
})
const xlsxParam = { raw: true }
let workbook = XLSX.utils.book_new()
var ws = XLSX.utils.table_to_sheet( document.querySelector('#exportTable'), xlsxParam)
XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩周原片生产汇总')
var prows = XLSX.utils.table_to_sheet( document.querySelector('#exportproductionTable'), xlsxParam)
XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩周成品生产汇总')
let fileName = '生产数据汇总表-周报.xlsx';
var wbout = XLSX.write(workbook, {
bookType: 'xlsx',
bookSST: true,
type: 'array',
});
try {
FileSaver.saveAs(
new Blob([wbout], { type: 'application/octet-stream' }),
fileName
);
this.$message.success('导出成功');
} catch (e) {
if (typeof console !== 'undefined') console.log(e, wbout);
}
return wbout;
},
search() {
this.$nextTick(() => {

32
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-23 17:16:11
* @LastEditTime: 2024-04-24 15:49:32
* @LastEditors: DY
* @Description:
-->
@@ -28,7 +28,9 @@
<script>
import glassYear from '../glass/year.vue'
import proYear from '../productionYearReport/index.vue'
import { parseTime } from '../../core/mixins/code-filter';
import { parseTime } from '../../core/mixins/code-filter'
import FileSaver from 'file-saver'
import * as XLSX from 'xlsx/xlsx.mjs'
export default {
components: { glassYear, proYear },
@@ -55,10 +57,28 @@ export default {
},
methods: {
handleExport() {
this.$nextTick(() => {
this.$refs['glassYear'].handleExport()
this.$refs['proYear'].handleExport()
})
const xlsxParam = { raw: true }
let workbook = XLSX.utils.book_new()
var ws = XLSX.utils.table_to_sheet( document.querySelector('#exportTable'), xlsxParam)
XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩年原片生产汇总')
var prows = XLSX.utils.table_to_sheet( document.querySelector('#exportproductionTable'), xlsxParam)
XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩年成品生产汇总')
let fileName = '生产数据汇总表-年报.xlsx';
var wbout = XLSX.write(workbook, {
bookType: 'xlsx',
bookSST: true,
type: 'array',
});
try {
FileSaver.saveAs(
new Blob([wbout], { type: 'application/octet-stream' }),
fileName
);
this.$message.success('导出成功');
} catch (e) {
if (typeof console !== 'undefined') console.log(e, wbout);
}
return wbout;
},
search() {
this.$nextTick(() => {

6
src/views/report/productionMonthReport/index.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-04-23 16:58:06
* @LastEditTime: 2024-04-24 15:27:49
* @LastEditors: DY
* @Description:
-->
@@ -26,7 +26,7 @@
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
</el-row>
</div>
<el-table id="exportTable" :data="list" style="width: 100%" :header-cell-style="{
<el-table id="exportproductionTable" :data="list" style="width: 100%" :header-cell-style="{
background: '#F2F4F9',
color: '#606266'
}">
@@ -496,7 +496,7 @@ export default {
/* 从表生成工作簿对象 */
import('xlsx').then(excel => {
var wb = excel.utils.table_to_book(
document.querySelector("#exportTable"),
document.querySelector("#exportproductionTable"),
xlsxParam
);
/* 获取二进制字符串作为输出 */

6
src/views/report/productionWeekReport/index.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-04-23 16:58:12
* @LastEditTime: 2024-04-24 15:29:21
* @LastEditors: DY
* @Description:
-->
@@ -28,7 +28,7 @@
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
</el-row>
</div>
<el-table id="exportTable" :data="list" style="width: 100%" :header-cell-style="{
<el-table id="exportproductionTable" :data="list" style="width: 100%" :header-cell-style="{
background: '#F2F4F9',
color: '#606266'
}">
@@ -517,7 +517,7 @@ export default {
/* 从表生成工作簿对象 */
import('xlsx').then(excel => {
var wb = excel.utils.table_to_book(
document.querySelector("#exportTable"),
document.querySelector("#exportproductionTable"),
xlsxParam
);
/* 获取二进制字符串作为输出 */

6
src/views/report/productionYearReport/index.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-04-23 17:21:04
* @LastEditTime: 2024-04-24 15:28:10
* @LastEditors: DY
* @Description:
-->
@@ -30,7 +30,7 @@
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
</el-row>
</div>
<el-table id="exportTable" :data="list" style="width: 100%" :header-cell-style="{
<el-table id="exportproductionTable" :data="list" style="width: 100%" :header-cell-style="{
background: '#F2F4F9',
color: '#606266'
}">
@@ -452,7 +452,7 @@ export default {
/* 从表生成工作簿对象 */
import('xlsx').then(excel => {
var wb = excel.utils.table_to_book(
document.querySelector("#exportTable"),
document.querySelector("#exportproductionTable"),
xlsxParam
);
/* 获取二进制字符串作为输出 */