From 947622a11997e34a92b5b74bc5982aba21562240 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 09 十二月 2025 12:29:09 +0800
Subject: [PATCH] 次破报表添加厚度以及相关功能
---
north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue | 438 ++----------------------------------------------------
1 files changed, 19 insertions(+), 419 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
index 36d816b..c67cd3a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
@@ -1,278 +1,10 @@
<script setup>
-
-import {reactive, ref} from "vue";
-import {useRouter} from 'vue-router'
-import request from "@/utils/request";
-import deepClone from "@/utils/deepClone";
-import {ElDatePicker, ElMessage} from "element-plus";
-import {useI18n} from 'vue-i18n'
-import footSum from "@/hook/footSum"
-import {changeFilterEvent} from "@/hook"
-//璇█鑾峰彇
+import BasicTable from "@/components/BrokenReportTemplate.vue"
+import request from "@/utils/request"
+import { ref} from "vue"
+import {useI18n} from "vue-i18n";
const {t} = useI18n()
-let router = useRouter()
-let filterData = ref({})
-//鎻愪氦鐨勮〃鍗�
-const form = reactive({
- date1: '',
- orderId: '',
- project: ''
-})
-
-//宸ュ簭
-const value = ref(t('machine.edgeGrinding'))
-
-//琛ㄥ熬姹傚拰
-const sumNum = (list, field) => {
- let count = 0
- list.forEach(item => {
- count += Number(item[field])
- })
- return count.toFixed(2)
-}
-
-//瀹氫箟婊氬姩鏉￠珮搴�
-let scrollTop = ref(null)
-let scrollHeight = ref(null)
-let clientHeight = ref(null)
-const scrollEvnt = (row) => {
- // 鍐呭楂樺害
- scrollTop.value = row.$event.target.scrollTop
- scrollHeight.value = row.$event.target.scrollHeight
- clientHeight.value = row.$event.target.clientHeight
-}
-
-
-//瀹氫箟椤甸潰鎬婚〉鏁�
-let pageTotal = ref('')
-//瀹氫箟鏁版嵁杩斿洖缁撴灉
-let produceList = ref([])
-//瀹氫箟褰撳墠椤垫暟
-let pageNum = ref(1)
-let pageState = null
-
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
-function getNowTime() {
- const pad = (n) => n.toString().padStart(2, '0');
-
- const formatDate = (date) => {
- const year = date.getFullYear();
- const month = pad(date.getMonth() + 1);
- const day = pad(date.getDate());
- return `${year}-${month}-${day} 08:00:00`;
- };
-
- const now = new Date();
- const startDate = new Date(now.getTime() - 3600 * 1000 * 24 * 3); // 涓夊ぉ鍓�
- const start = formatDate(startDate);
- const end = formatDate(now);
-
- return [start, end];
-}
-
-
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1 = getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
-let total = reactive({
- pageTotal: 0,
- dataTotal: 0,
- pageSize: 100
-})
-//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
-const titleSelectJson = ref({
- processType: [],
-})
-let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
-
-// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
-date.setDate(date.getDate() + 1);
-const pad = (n) => n.toString().padStart(2, '0');
-let year = date.getFullYear();
-let month = pad(date.getMonth() + 1);
-let day = pad(date.getDate());
-let newEndTime = `${year}-${month}-${day} 08:00:00`;
-//绗竴娆″姞杞芥暟鎹�
-request.post(`/report/damageReport/1/${total.pageSize}/${startTime}/${newEndTime}`, filterData.value).then((res) => {
-
- if (res.code == 200) {
- total.dataTotal = res.data.total.total*1
- total.pageTotal= res.data.total.pageTotal
- pageTotal.value = res.data.total
- total.value = res.data.footSum
- produceList = produceList.value.concat(deepClone(res.data.data))
- xGrid.value.reloadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
-})
-
-//椤佃剼缈婚〉鏌ヨ
-const selectPageList = () => {
- const rawStart = new Date(form.date1[0]);
- const rawEnd = new Date(form.date1[1]);
- // 濡傛灉鏃堕棿閮ㄥ垎鏄� 00:00锛屽垯璁剧疆涓� 08:00
- if (rawStart.getHours() === 8 || rawStart.getHours() === 0) {
- rawStart.setHours(8, 0, 0, 0);
- }
- if (rawEnd.getHours() === 8 || rawEnd.getHours() === 0) {
- rawEnd.setHours(8, 0, 0, 0);
- }
- const startTime = formatDateTime(rawStart);
- const endPlusOne = new Date(rawEnd);
- endPlusOne.setDate(endPlusOne.getDate());
- const newEndTime = formatDateTime(endPlusOne);
- form.date1 = [startTime, newEndTime];
- request.post(`/report/damageReport/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}`, filterData.value).then((res) => {
- if (res.code == 200) {
-
- total.value = res.data.footSum
- produceList = deepClone(res.data.data)
- xGrid.value.reloadData(produceList)
- } else {
- ElMessage.warning(res.msg)
- }
- })
-}
-
-const formatDateTime = (date) => {
- const year = date.getFullYear();
- const month = pad(date.getMonth() + 1);
- const day = pad(date.getDate());
- const hour = pad(date.getHours());
- const minute = pad(date.getMinutes());
- return `${year}-${month}-${day} ${hour}:${minute}:00`;
-};
-
-
-//鐐瑰嚮鏌ヨ
-const getWorkOrder = () => {
- gridOptions.loading = true
- // 鍘熷 form.date1 鏄棩鏈熷璞℃暟缁�
- const rawStart = new Date(form.date1[0]);
- const rawEnd = new Date(form.date1[1]);
- // 濡傛灉鏃堕棿閮ㄥ垎鏄� 00:00锛屽垯璁剧疆涓� 08:00
- if (rawStart.getHours() === 8 || rawStart.getHours() === 0) {
- rawStart.setHours(8, 0, 0, 0);
- }
- if (rawEnd.getHours() === 8 || rawEnd.getHours() === 0) {
- rawEnd.setHours(8, 0, 0, 0);
- }
-
- const startTime = formatDateTime(rawStart);
- const endPlusOne = new Date(rawEnd);
- endPlusOne.setDate(endPlusOne.getDate());
- const newEndTime = formatDateTime(endPlusOne);
- form.date1 = [startTime, newEndTime];
- request.post(`/report/damageReport/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}`, filterData.value).then((res) => {
-
- if (res.code == 200) {
- total.value = res.data.footSum
- total.dataTotal = res.data.total.total * 1
- total.pageTotal = res.data.total.pageTotal
- pageTotal.value = res.data.total
- xGrid.value.loadData(res.data.data)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
- })
-}
-
-//椤佃剼璺宠浆
-const handlePageChange = ({currentPage, pageSize}) => {
- pageNum.value = currentPage
- total.pageTotal = pageSize
- selectPageList()
-}
-
-
-
-function filterChanged(column){
- //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
- let value = column.datas[0]!=undefined?column.datas[0]:''
- value = value.trim()
- //鍒ゆ柇鏄惁瀛樺湪澶栭敭
- if (column.property.indexOf('.')>-1){
- const columnArr = column.property.split('.')
- filterData.value[columnArr[0]] = {
- [columnArr[1]]:value
- }
- }else{
- filterData.value[column.property] = value
- }
- gridOptions.loading = true
-
- const rawStart = new Date(form.date1[0]);
- const rawEnd = new Date(form.date1[1]);
- // 濡傛灉鏃堕棿閮ㄥ垎鏄� 00:00锛屽垯璁剧疆涓� 08:00
- if (rawStart.getHours() === 8 || rawStart.getHours() === 0) {
- rawStart.setHours(8, 0, 0, 0);
- }
- if (rawEnd.getHours() === 8 || rawEnd.getHours() === 0) {
- rawEnd.setHours(8, 0, 0, 0);
- }
- const startTime = formatDateTime(rawStart);
- const endPlusOne = new Date(rawEnd);
- endPlusOne.setDate(endPlusOne.getDate());
- const newEndTime = formatDateTime(endPlusOne);
- form.date1 = [startTime, newEndTime];
- request.post(`/report/damageReport/1/${total.pageSize}/${startTime}/${newEndTime}`, filterData.value).then((res) => {
-
- if (res.code == 200) {
- total.value = res.data.footSum
- total.dataTotal = res.data.total.total*1
- total.pageTotal=parseInt(res.data.total)
- pageNum.value=1
- produceList = deepClone(res.data.data)
- xGrid.value.loadData(produceList)
- gridOptions.loading=false
- } else {
- ElMessage.warning(res.msg)
- }
- })
-
-}
-
-/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
-const hasDecimal = (value) => {
- const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
- return regex.test(value); // 杩斿洖true/false
-}
-
-//瀛愮粍浠舵帴鏀跺弬鏁�
-const xGrid = ref()
-const gridOptions = reactive({
- loading: true,
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'DamageReport',
- showFooter: true,//鏄剧ず鑴�
- printConfig: {},
- importConfig: {},
- exportConfig: {},
- scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
- showOverflow: true,
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },//琛ㄥご鍙傛暟
+const childrenData = ref({
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
@@ -310,162 +42,30 @@
{field: 'responsibleEquipment', width: 120, title: t('reportingWorks.responsibleEquipment'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'breakageType', width: 120, title: t('reportingWorks.breakageType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'breakageReason', width: 120, title: t('reportingWorks.breakageReason'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'childWidth', width: 100, title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'childHeight', width: 100, title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'thisProcess',width: 120, title: t('reportingWorks.reportingProcess'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'creator',width: 120, title: t('product.creator'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'childWidth', width: 100, title: t('order.width'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'childHeight', width: 100, title: t('order.height'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'thickness',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 90, title: t('order.totalThickness')},
{field: 'breakageQuantity', width: 120, title: t('reportingWorks.quantityBroken')},
{field: 'area', width: 120, title: t('reportingWorks.wornArea')},
{field: 'personnel', width: 120, title: t('reportingWorks.responsiblePersonnel')},
{field: 'glassChild', width: 120, title: t('reportingWorks.glassChild'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- ],//琛ㄥご鎸夐挳
-
- toolbarConfig: {
- slots: {
- tools: 'toolbar_buttons'
- },
- zoom: true,
- custom: true
- },
- data: [],//table body瀹為檯鏁版嵁
- //鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- return[
- columns.map((column, columnIndex) => {
- if (columnIndex === 0) {
- return t('basicData.total')
- }
- const List = ["breakageQuantity",'area',]
- if (List.includes(column.field)) {
- // return footSum(data, column.field)
- return total.value?.[column.field] ?? 0
- }
- return ''
- })
- ]
- }
-
+ {field: 'reportingWorkId', width: 100,title: t('reportingWorks.reportingWorkId'),filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ ],//琛ㄦ牸琛ㄥご瀛楁
+ data:[],//琛ㄦ牸鏁版嵁
+ url :'/report/damageReport',
+ exportUrl :'/report/exportDamageReport',
+ exportName:t('report.secondaryBrokenTotal'),
+ footList:['breakageQuantity','area']
})
-function exportExcel(url, fileName,date) {
- if(date===null){
- ElMessage.warning(t('report.pleaseSelectADateFirst'))
- return
- }
-
-
- const date1 = new Date(date[0]);
- const date2 = new Date(date[1]);
- const timeDiff = Math.abs(date2.getTime() - date1.getTime());
- const daysDiff = timeDiff / (1000 * 3600 * 24);
- if(Math.floor(daysDiff)>180){
- ElMessage.warning(t('report.theFilteringTimeForExportCannotExceed180Days'))
- return
- }
- let dataMp = ref({
- date: date,
- })
- request.post(url,dataMp.value,{responseType :'blob'}).then(res => {
- const blob = new Blob([res])
- if ('download' in document.createElement('a')) { // 闈濱E涓嬭浇
- const elink = document.createElement('a')
- elink.download = `${fileName}.xlsx`
- elink.style.display = 'none'
- elink.href = URL.createObjectURL(blob)
- document.body.appendChild(elink)
- elink.click()
- URL.revokeObjectURL(elink.href) // 閲婃斁URL 瀵硅薄
- document.body.removeChild(elink)
- } else { // IE10+涓嬭浇
- navigator.msSaveBlob(blob, fileName)
- }
-
- })
-}
</script>
<template>
- <div style="width: 100%;height: 100%">
- <div class="head">
- <el-date-picker
- v-model="form.date1"
- :start-placeholder="$t('basicData.startDate')"
- :end-placeholder="$t('basicData.endDate')"
- format="YYYY/MM/DD HH:mm"
- type="daterange"
- value-format="YYYY-MM-DD HH:mm"
- />
-
- <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
-
- </div>
- <div class="main-table">
- <vxe-grid
- ref="xGrid"
- class="mytable-scrollbar"
- height="100%"
- v-bind="gridOptions"
- @filter-change="filterChanged"
-
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{ item.title + ': ' }}</span>
- <span>{{ row[item.field] }}</span>
- </li>
- </ul>
- </template>
-
- <template #toolbar_buttons>
- <vxe-button style="margin-right: 0.5rem"
- @click="exportExcel('/report/exportDamageReport',
- t('report.secondaryBrokenReport'),
- form.date1)">
- {{t('basicData.export')}}</vxe-button>
- </template>
-
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="type"
- @keyup.enter.native="$panel.confirmFilter()"
- @input="changeFilterEvent($event, option, $panel)"/>
- </div>
- </div>
- </template>
- <template #pager>
- <!--浣跨敤 pager 鎻掓Ы-->
- <!-- 'PrevJump','NextJump', -->
- <vxe-pager
- v-model:current-page="pageNum"
- v-model:page-size="total.pageSize"
- v-model:pager-count="total.pageTotal"
- :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
- :total="total.dataTotal"
- @page-change="handlePageChange"
- >
- </vxe-pager>
- </template>
-
- </vxe-grid>
- </div>
- </div>
+ <basic-table
+ :childrenData="childrenData"/>
</template>
<style scoped>
-.head{
- width: 100%;
- height: 35px;
-}
-
-.main-table{
- width: 100%;
- height: calc(100% - 35px);
-}
-
-#selectForm {
- width: 60%;
- text-align: center;
-}
</style>
\ No newline at end of file
--
Gitblit v1.8.0