From 7a99f8624b085fc309ffa6b7c98bb813a1c33834 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 22 十月 2025 17:06:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/ReportWork/reportWork.vue | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index 5ccecda..a2b9fd5 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -27,7 +27,7 @@
</el-select>
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('reportmanage.inquire')
}}</el-button>
- <el-button type="success" style="margin-left: 10px;" :disabled="(!selectedStatus)" @click="handleConfirm">{{
+ <el-button type="success" style="margin-left: 10px;" :disabled="isConfirmDisabled" @click="handleConfirm">{{
$t('reportmanage.signingwork')
}}</el-button>
</div>
@@ -163,8 +163,9 @@
import { useI18n } from 'vue-i18n'
import { inject } from 'vue';
const globalDate = inject('globalDate');
-const currentPage = ref(1)
const totalRecords = ref(0)
+const pageSize = ref(20)
+const currentPage = ref(1)
const { t } = useI18n()
const timeRange = ref([])
const reportData = ref([])
@@ -187,9 +188,14 @@
status: '1',
workingProcedure: '0',
});
+const isConfirmDisabled = computed(() => {
+ return report.value.type === '1' || !selectedStatus.value;
+});
// 鏌ヨ鏁版嵁
const selectReportData = async () => {
const response = await request.post("/cacheVerticalGlass/damage/selectDamage", {
+ pageNo: currentPage.value,
+ pageSize: pageSize.value,
startTime: (timeRange.value && timeRange.value[0]) || '',
endTime: (timeRange.value && timeRange.value[1]) || '',
type: report.value.type,
@@ -207,23 +213,16 @@
selectedStatus.value = false;
}
if (response.code === 200) {
- const formattedData = response.data.map(record => ({
+ const formattedData = response.data.records.map(record => ({
...record,
formattedCreateTime: formatTimestamp(record.damageTime),
}));
reportData.value = formattedData;
ElMessage.success(response.message);
-
+ totalRecords.value = response.data.total || 0
} else {
ElMessage.error(response.message);
}
- // const responses = await request.post("/cacheVerticalGlass/damage/insertDamage", {
- // glassId:"P24081502|1|1",
- // line:"1001",
- // workingProcedure:"鍒囧壊",
- // remark:"",
- // status:"0"
- // })
};
// 鎶ュ伐
const handleConfirm = async () => {
@@ -267,10 +266,8 @@
}
};
const handlePageChange = (newPage) => {
-currentPage.value = newPage;
-window.localStorage.setItem('pagenumber', currentPage.value)
-historicala(currentPage.value);
-Dailya(currentPage.value);
+ currentPage.value = newPage;
+ selectReportData();
};
const handleInputChangea = (value, rowId) => {
// 鏇存柊瀵瑰簲琛岀殑 select 鍊�
@@ -282,17 +279,21 @@
inputValuesa[rowId] = value;
inputValuesb[rowId] = value;
};
-fetchTableData();
+// fetchTableData();
function gettypeType(type: number) {
switch (type) {
- case 9:
+ case 1:
return 'success';
- case 8:
+ case 9:
return 'danger';
+ case 8:
+ return 'warning';
}
}
function gettypeText(type: number) {
switch (type) {
+ case 1:
+ return t('reportmanage.completed');
case 9:
return t('reportmanage.takeout');
case 8:
@@ -359,6 +360,7 @@
onMounted(() => {
fetchTableData();
parseAndSetTime();
+ selectReportData()
// socket = initializeWebSocket(socketUrl, handleMessage);
});
onUnmounted(() => {
--
Gitblit v1.8.0