From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue | 187 ++++++++++++++++++++++++++++++----------------
1 files changed, 123 insertions(+), 64 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
index 31a5ae0..8202ab4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
@@ -1,6 +1,6 @@
<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";
@@ -8,6 +8,8 @@
import {useI18n} from 'vue-i18n'
import {changeFilterEvent, filterChanged} from "@/hook"
import footSum from "@/hook/footSum"
+import {VxeUI} from "vxe-pc-ui";
+import {addListener} from "@/hook/mouseMove";
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
@@ -57,13 +59,17 @@
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+ const end = new Date(new Date().getTime())
.toISOString()
.replace('T', ' ')
.slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
return [start, end]
}
+onMounted(() => {
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
+})
//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
form.date1 = getNowTime()
@@ -87,13 +93,18 @@
const titleSelectJson = ref({
processType: [],
})
+let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+date.setDate(date.getDate() + 1);
+let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
//绗竴娆″姞杞芥暟鎹�
-request.post(`/report/selectProcessToBeCompleted/${startTime}/${endTime}/${inputVal}/${inputProject}/${selectProcesses}`, filterData.value).then((res) => {
+request.post(`/report/selectProcessToBeCompleted/${startTime}/${newEndTime}/${inputVal}/${inputProject}/${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
+ //total.value = res.data.footSum
produceList = produceList.value.concat(deepClone(res.data.data))
titleSelectJson.value.processType = res.data.process
xGrid.value.reloadData(produceList)
@@ -111,13 +122,18 @@
if (inputVal == '') {
inputVal = null
}
-
- request.post(`/report/selectProcessToBeCompleted/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
+ gridOptions.loading = true
+ let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+ date.setDate(date.getDate() + 1);
+ let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+ request.post(`/report/selectProcessToBeCompleted/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${inputVal}`, filterData.value).then((res) => {
if (res.code == 200) {
-
+ //total.value = res.data.footSum
produceList = deepClone(res.data.data)
xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
}
@@ -126,7 +142,7 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
-
+ gridOptions.loading = true
let startTime = form.date1[0]
let endTime = form.date1[1]
let selectProcesses = value.value
@@ -138,14 +154,20 @@
if (inputProject == '') {
inputProject = null
}
- request.post(`/report/selectProcessToBeCompleted/${startTime}/${endTime}/${inputVal}/${inputProject}/${selectProcesses}`, filterData.value).then((res) => {
+ let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+ date.setDate(date.getDate() + 1);
+ let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+ request.post(`/report/selectProcessToBeCompleted/${startTime}/${newEndTime}/${inputVal}/${inputProject}/${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
+ //total.value = res.data.footSum
produceList = deepClone(res.data.data)
xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
}
@@ -260,15 +282,38 @@
{field: 'glass_child', width: 100, title: t('reportingWorks.glassChild'), filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged},
- {field: 'child_width', width: 120, title: t('order.width')},
- {field: 'child_height', width: 120, title: t('order.height')},
- {field: 'quantity', width: 120, title: t('order.quantity')},
- {field: 'childArea', width: 120, title: t('order.trueArea')},
- {field: 'actualArea', width: 120, title: t('order.trueGrossArea')},
- {field: 'completeNum', width: 120, title: t('report.completedQuantity')},
- {field: 'completeArea', width: 120, title: t('report.completedArea')},
- {field: 'incompleteNum', width: 120, title: t('report.unfinishedQuantity')},
- {field: 'incompleteArea', width: 120, title: t('report.unfinishedArea')},
+ {field: 'child_width', width: 120, title: t('order.width'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'child_height', width: 120, title: t('order.height'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'thickness',filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: 90, title: t('order.totalThickness')},
+
+ {field: 'quantity', width: 120, title: t('order.quantity'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'childArea', width: 130, title: t('order.trueArea'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'actualArea', width: 130, title: t('order.trueGrossArea'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'completeNum', width: 120, title: t('report.completedQuantity'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'completeArea', width: 120, title: t('report.completedArea'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'incompleteNum', width: 120, title: t('report.unfinishedQuantity'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'incompleteArea', width: 120, title: t('report.unfinishedArea'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
{field: 'product_name', width: 120, title: t('order.product'), filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged},
@@ -324,7 +369,7 @@
ElMessage.warning(t('report.pleaseSelectAProcessFirst'))
return
}
-
+ gridOptions.loading = true
const date1 = new Date(date[0]);
const date2 = new Date(date[1]);
const timeDiff = Math.abs(date2.getTime() - date1.getTime());
@@ -350,6 +395,7 @@
elink.click()
URL.revokeObjectURL(elink.href) // 閲婃斁URL 瀵硅薄
document.body.removeChild(elink)
+ gridOptions.loading = false
} else { // IE10+涓嬭浇
navigator.msSaveBlob(blob, fileName)
}
@@ -357,12 +403,14 @@
})
}
+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"/>-->
@@ -371,7 +419,6 @@
:start-placeholder="$t('basicData.startDate')"
:end-placeholder="$t('basicData.endDate')"
format="YYYY/MM/DD"
- style="width: 100px"
type="daterange"
value-format="YYYY-MM-DD"
/>
@@ -380,7 +427,7 @@
<el-input v-model="form.project" clearable :placeholder="$t('order.project')" style="width: 130px"></el-input>
- <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
+ <el-select v-model="value" clearable :placeholder="$t('reportingWorks.selectProcess')" default-value="default_city" style="width: 120px">
<el-option
v-for="item in titleSelectJson['processType']"
:key="item.id"
@@ -389,63 +436,75 @@
/>
</el-select>
<el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
- </el-row>
</div>
- <vxe-grid
- ref="xGrid"
- class="mytable-scrollbar"
- max-height="100%"
- v-bind="gridOptions"
+ <div class="main-table">
+ <vxe-grid
+ ref="xGrid"
+ class="mytable-scrollbar"
+ height="100%"
+ v-bind="gridOptions"
+ @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 #button_slot="{ row }">
- <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{$t('basicData.edit')}}</el-button>
- <el-button link size="small" type="primary" @click="getTableRow(row,'setType')">{{$t('basicData.cancelReview')}}</el-button>
- <el-button link size="small" type="primary" @click="getTableRow(row,'delete')">{{$t('basicData.delete')}}</el-button>
- </template>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <template #button_slot="{ row }">
+ <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{$t('basicData.edit')}}</el-button>
+ <el-button link size="small" type="primary" @click="getTableRow(row,'setType')">{{$t('basicData.cancelReview')}}</el-button>
+ <el-button link size="small" type="primary" @click="getTableRow(row,'delete')">{{$t('basicData.delete')}}</el-button>
+ </template>
- <template #toolbar_buttons>
- <vxe-button style="margin-right: 0.5rem"
- @click="exportExcel('/report/exportProcessToBeCompleted',
+ <template #toolbar_buttons>
+ <vxe-button style="margin-right: 0.5rem"
+ @click="exportExcel('/report/exportProcessToBeCompleted',
t('report.processToBeCompleted'),
form.date1)">
- {{t('basicData.export')}}</vxe-button>
- </template>
+ {{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" @input="changeFilterEvent($event, option, $panel)"/>
+ <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>
- </div>
- </template>
+ </template>
- </vxe-grid>
+ </vxe-grid>
+ </div>
</div>
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 93%;
+.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