From 53bc276bdc4aaefc2a2ecadc472f2c2f18e93490 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 十一月 2025 16:53:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue | 417 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 306 insertions(+), 111 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
index e6d9056..59aa234 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -1,16 +1,20 @@
<script setup>
-import {reactive, ref} from "vue";
+import {onMounted, 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 {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove"
+import {VxeUI} from "vxe-pc-ui";
+import companyInfo from "@/stores/sd/companyInfo";
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
let filterData = ref({})
+const company = companyInfo()
//鎻愪氦鐨勮〃鍗�
const form = reactive({
date1: '',
@@ -50,26 +54,44 @@
let pageNum = ref(1)
let pageState = null
-let newItem= ref({
- basic_name: '鍏ㄩ儴',
- basic_type: 'product',
- basic_category: 'process',
- id: "001"
- })
+//璁＄畻鏃堕棿宸�
+function getDaysBetween(startTime, endTime, includeEnd = false) {
+ const start = new Date(startTime)
+ const end = new Date(endTime)
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
-function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
- return [start, end]
+ // 杞负鏃堕棿鎴宠绠楀樊鍊�
+ const diffMs = end.setHours(0, 0, 0, 0) - start.setHours(0, 0, 0, 0)
+ const diffDays = diffMs / (1000 * 60 * 60 * 24)
+
+ // 杩斿洖鏁存暟澶╂暟
+ return includeEnd ? diffDays + 1 : diffDays
}
+const times=company.reportTime
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+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} ${times}`;
+ };
+
+ 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];
+}
+
+onMounted(() => {
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
+
+})
//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
form.date1 = getNowTime()
@@ -86,16 +108,27 @@
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} ${times}`;
//绗竴娆″姞杞芥暟鎹�
-request.post(`/report/teamOutput/1/${total.pageSize}/${startTime}/${endTime}/${selectProcesses}`, filterData.value).then((res) => {
+request.post(`/report/teamOutput/1/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, 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
produceList = produceList.value.concat(deepClone(res.data.data))
titleSelectJson.value.processType = res.data.process
- titleSelectJson.value.processType.unshift(newItem.value)
+ produceList.forEach(item => {
+ item.mmTotal = sumMmValues(item.workProcessName);
+ });
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -105,43 +138,139 @@
//椤佃剼缈婚〉鏌ヨ
const selectPageList = () => {
- let startTime = form.date1[0]
- let endTime = form.date1[1]
- let selectProcesses = procseeValue.value
+ gridOptions.loading = true
+ // 瑙ｆ瀽 company.reportTime
+ const [reportHourStr, reportMinuteStr] = company.reportTime.split(":");
+ const reportHour = parseInt(reportHourStr);
+ const reportMinute = parseInt(reportMinuteStr);
- request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${selectProcesses}`, filterData.value).then((res) => {
+ // 鍘熷 form.date1 鏄棩鏈熷璞℃暟缁�
+ const rawStart = new Date(form.date1[0]);
+ const rawEnd = new Date(form.date1[1]);
+
+ // 鍒ゆ柇鏃堕棿閮ㄥ垎鏄惁闇�瑕佷慨姝ｄ负 company.reportTime
+ const isZeroOrReport = (dateObj) => {
+ const h = dateObj.getHours();
+ const m = dateObj.getMinutes();
+ // 鍒ゆ柇鏉′欢锛氭槸 00:00 鎴栬�呮槸 reportTime 瀵瑰簲鐨勬椂闂�
+ return (h === 0 && m === 0) || (h === reportHour && m === reportMinute);
+ };
+
+ if (isZeroOrReport(rawStart)) {
+ rawStart.setHours(reportHour, reportMinute, 0, 0);
+ }
+ if (isZeroOrReport(rawEnd)) {
+ rawEnd.setHours(reportHour, reportMinute, 0, 0);
+ }
+ const startTime = formatDateTime(rawStart);
+ const endPlusOne = new Date(rawEnd);
+ endPlusOne.setDate(endPlusOne.getDate());
+ const newEndTime = formatDateTime(endPlusOne);
+ const selectProcesses = procseeValue.value;
+ form.date1 = [startTime, newEndTime];
+ request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {
if (res.code == 200) {
-
+ total.value = res.data.footSum
produceList = deepClone(res.data.data)
+ produceList.forEach(item => {
+ item.mmTotal = sumMmValues(item.workProcessName);
+ });
xGrid.value.reloadData(produceList)
- } else {
- ElMessage.warning(res.msg)
- }
- })
-}
-
-//鐐瑰嚮鏌ヨ
-const getWorkOrder = () => {
-
- let startTime = form.date1[0]
- let endTime = form.date1[1]
- let selectProcesses = procseeValue.value
-
- request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${selectProcesses}`, 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
- xGrid.value.loadData(res.data.data)
gridOptions.loading = false
} 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;
+
+ // 瑙ｆ瀽 company.reportTime
+ const [reportHourStr, reportMinuteStr] = company.reportTime.split(":");
+ const reportHour = parseInt(reportHourStr);
+ const reportMinute = parseInt(reportMinuteStr);
+
+ // 鍘熷 form.date1 鏄棩鏈熷璞℃暟缁�
+ const rawStart = new Date(form.date1[0]);
+ const rawEnd = new Date(form.date1[1]);
+
+ // 鍒ゆ柇鏃堕棿閮ㄥ垎鏄惁闇�瑕佷慨姝ｄ负 company.reportTime
+ const isZeroOrReport = (dateObj) => {
+ const h = dateObj.getHours();
+ const m = dateObj.getMinutes();
+ // 鍒ゆ柇鏉′欢锛氭槸 00:00 鎴栬�呮槸 reportTime 瀵瑰簲鐨勬椂闂�
+ return (h === 0 && m === 0) || (h === reportHour && m === reportMinute);
+ };
+
+ if (isZeroOrReport(rawStart)) {
+ rawStart.setHours(reportHour, reportMinute, 0, 0);
+ }
+ if (isZeroOrReport(rawEnd)) {
+ rawEnd.setHours(reportHour, reportMinute, 0, 0);
+ }
+
+ // 鏍煎紡鍖�
+ const startTime = formatDateTime(rawStart);
+
+ const endPlusOne = new Date(rawEnd);
+ endPlusOne.setDate(endPlusOne.getDate());
+ const newEndTime = formatDateTime(endPlusOne);
+
+ const selectProcesses = procseeValue.value;
+
+ const timeDifference = getDaysBetween(startTime, newEndTime);
+ if (timeDifference > 180) {
+ ElMessage.warning(t('report.theTimeLimitCannotExceed180Days'));
+ gridOptions.loading = false;
+ return;
+ }
+
+ form.date1 = [startTime, newEndTime];
+
+ request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, 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;
+
+ produceList = res.data.data;
+ produceList.forEach(item => {
+ item.mmTotal = sumMmValues(item.workProcessName);
+ });
+
+ xGrid.value.loadData(produceList);
+ gridOptions.loading = false;
+ } else {
+ ElMessage.warning(res.msg);
+ }
+ });
+}
+
+ const sumMmValues = (workProcessName) => {
+ if (!workProcessName) return 0;
+
+ return workProcessName
+ .split('+') // 鎷嗗垎姣忎釜閮ㄥ垎
+ .map(part => {
+ const match = part.match(/^(\d+)(?=mm)/); // 鎻愬彇 mm 鍓嶉潰鐨勬暟瀛�
+ return match ? parseInt(match[1], 10) : 0;
+ })
+ .reduce((sum, num) => sum + num, 0); // 姹傚拰
+}
//椤佃剼璺宠浆
const handlePageChange = ({currentPage, pageSize}) => {
pageNum.value = currentPage
@@ -156,6 +285,7 @@
}
function filterChanged(column){
+ gridOptions.loading = true
let selectProcesses = procseeValue.value
//gridOptions.loading=true
//绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
@@ -170,18 +300,48 @@
}else{
filterData.value[column.property] = value
}
- gridOptions.loading = true
- let startTime = form.date1[0]
- let endTime = form.date1[1]
- request.post(`/report/teamOutput/1/${total.pageSize}/${startTime}/${endTime}/${selectProcesses}`, filterData.value).then((res) => {
+ // 瑙ｆ瀽 company.reportTime
+ const [reportHourStr, reportMinuteStr] = company.reportTime.split(":");
+ const reportHour = parseInt(reportHourStr);
+ const reportMinute = parseInt(reportMinuteStr);
+
+ // 鍘熷 form.date1 鏄棩鏈熷璞℃暟缁�
+ const rawStart = new Date(form.date1[0]);
+ const rawEnd = new Date(form.date1[1]);
+
+ // 鍒ゆ柇鏃堕棿閮ㄥ垎鏄惁闇�瑕佷慨姝ｄ负 company.reportTime
+ const isZeroOrReport = (dateObj) => {
+ const h = dateObj.getHours();
+ const m = dateObj.getMinutes();
+ // 鍒ゆ柇鏉′欢锛氭槸 00:00 鎴栬�呮槸 reportTime 瀵瑰簲鐨勬椂闂�
+ return (h === 0 && m === 0) || (h === reportHour && m === reportMinute);
+ };
+
+ if (isZeroOrReport(rawStart)) {
+ rawStart.setHours(reportHour, reportMinute, 0, 0);
+ }
+ if (isZeroOrReport(rawEnd)) {
+ rawEnd.setHours(reportHour, reportMinute, 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/teamOutput/1/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
+ total.value = res.data.footSum
produceList = deepClone(res.data.data)
- xGrid.value.reloadData(produceList)
+ produceList.forEach(item => {
+ item.mmTotal = sumMmValues(item.workProcessName);
+ });
+ xGrid.value.loadData(produceList)
+
gridOptions.loading=false
} else {
ElMessage.warning(res.msg)
@@ -199,6 +359,7 @@
//瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
const gridOptions = reactive({
+ loading: true,
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
@@ -245,17 +406,29 @@
{
field: 'project', width: 120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
},
+ {field: 'batch', width: 90, title: t('order.batch'),
+ filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderType', width: 90, title: t('order.orderType')},
{
field: 'processId', width: 140, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
},
{field: 'orderNumber', width: 90, title: t('order.OrderNum')},
- {field: 'code', width: 60, title: t('reportingWorks.glassNumber')},
- {field: 'width', width: 100, title: t('order.width')},
- {field: 'height', width: 100, title: t('order.height')},
+ {field: 'code', width: 100, title: t('reportingWorks.glassNumber')},
+ {field: 'width', width: 90, title: t('order.width')},
+ {field: 'height', width: 90, title: t('order.height')},
+ {field: 'thicknessSum',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 90, title: t('order.totalThickness')},
+ {field: 'thicknessArea', width: 90, title: t('report.thicknessArea')},
+ {
+ field: 'deviceName', width: 140, title: t('machine.basicName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
+ },
+ {field: 'workProcessName', width: 120, title: t('report.workProcessName'),
+ filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'edgingType', width: 110, title: t('order.edgingType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'completedQuantity', width: 90, title: t('reportingWorks.completedQuantity')},
{field: 'area', width: 100, title: t('reportingWorks.completedArea')},
- {field: 'productName', title: t('order.product')},
+ {field: 'reviewed',width: 80, title: t('processCard.reviewed')},
+ {field: 'examineTime',width: 80, title: t('ingredientsStock.reviewedTime')},
+ {field: 'productName',width: 150, title: t('order.product')},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -279,9 +452,10 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["completedQuantity",'area',]
+ const List = ["completedQuantity",'area','thicknessArea']
if (List.includes(column.field)) {
- return footSum(data, column.field)
+ //return footSum(data, column.field)
+ return total.value?.[column.field] ?? 0
}
return ''
})
@@ -291,6 +465,7 @@
})
function exportExcel(url, fileName,date) {
+ gridOptions.loading = true
let processes = procseeValue.value
if(date===null){
ElMessage.warning(t('report.pleaseSelectADateFirst'))
@@ -325,18 +500,22 @@
elink.click()
URL.revokeObjectURL(elink.href) // 閲婃斁URL 瀵硅薄
document.body.removeChild(elink)
+ gridOptions.loading = false
} else { // IE10+涓嬭浇
navigator.msSaveBlob(blob, fileName)
}
})
}
+
+const handleCellDblClick = ({ row, column, cell, $event }) => {
+ VxeUI.clipboard.copy(row[column.property])
+}
</script>
<template>
- <div class="main-div-customer">
- <div id="selectForm">
- <el-row :gutter="0">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
@@ -344,13 +523,17 @@
v-model="form.date1"
:start-placeholder="$t('basicData.startDate')"
:end-placeholder="$t('basicData.endDate')"
- format="YYYY/MM/DD"
- style="width: 100px"
+ format="YYYY/MM/DD HH:mm"
+ style="width: 350px"
type="daterange"
- value-format="YYYY-MM-DD"
+ value-format="YYYY/MM/DD HH:mm"
/>
<el-select v-model="procseeValue" clearable default-value="default_city" style="width: 120px">
+ <el-option
+ :label="t('report.allProcess')"
+ :value="'all'"
+ />
<el-option
v-for="item in titleSelectJson['processType']"
:key="item.id"
@@ -359,68 +542,80 @@
/>
</el-select>
<el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
- </el-row>
+
</div>
- <vxe-grid
- ref="xGrid"
- class="mytable-scrollbar"
- height="100%"
- v-bind="gridOptions"
- @filter-change="filterChanged"
+ <div class="main-table">
+ <vxe-grid
+ ref="xGrid"
+ class="mytable-scrollbar"
+ height="100%"
+ v-bind="gridOptions"
+ @filter-change="filterChanged"
+ @cell-dblclick="handleCellDblClick"
- >
- <!-- @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>
+ >
+ <!-- @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 #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>
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <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>
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
- <template #toolbar_buttons>
- <vxe-button style="margin-right: 0.5rem"
- @click="exportExcel('/report/exportTeamOutput',
+ </template>
+ <template #toolbar_buttons>
+ <vxe-button style="margin-right: 0.5rem"
+ @click="exportExcel('/report/exportTeamOutput',
t('report.teamOutput'),
form.date1)">
- {{t('basicData.export')}}</vxe-button>
- </template>
+ {{t('basicData.export')}}</vxe-button>
+ </template>
- </vxe-grid>
+ </vxe-grid>
+ </div>
</div>
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 90%;
+.head{
+ width: 100%;
+ height: 35px;
}
-#selectForm {
- width: 60%;
- text-align: center;
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0