From 35e8bd80ff9d33a7ab01777f863a41ce97a2051a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 14 八月 2025 14:54:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_7004' into dev_7004
---
src/views/equipmentManagement/upkeep/index.vue | 7 ++++++-
src/views/financialManagement/expenseManagement/index.vue | 2 +-
src/views/collaborativeApproval/approvalProcess/index4.vue | 4 ++--
src/views/collaborativeApproval/approvalProcess/index2.vue | 4 ++--
src/views/collaborativeApproval/approvalProcess/index1.vue | 4 ++--
src/views/equipmentManagement/repair/index.vue | 7 ++++++-
src/views/collaborativeApproval/approvalProcess/index3.vue | 4 ++--
src/views/financialManagement/revenueManagement/index.vue | 2 +-
src/views/equipmentManagement/ledger/index.vue | 7 ++++++-
9 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index1.vue b/src/views/collaborativeApproval/approvalProcess/index1.vue
index 23dc792..c46c68a 100644
--- a/src/views/collaborativeApproval/approvalProcess/index1.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index1.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div class="container">
<!-- 寮曞叆index.vue缁勪欢骞朵紶閫掑弬鏁� -->
<ApprovalProcessIndex :approveType="1" />
</div>
@@ -15,7 +15,7 @@
</script>
<style scoped>
-.app-container {
+.container {
width: 100%;
height: 100%;
}
diff --git a/src/views/collaborativeApproval/approvalProcess/index2.vue b/src/views/collaborativeApproval/approvalProcess/index2.vue
index f7ff968..7c15c3e 100644
--- a/src/views/collaborativeApproval/approvalProcess/index2.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index2.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div class="container">
<!-- 寮曞叆index.vue缁勪欢骞朵紶閫掑弬鏁� -->
<ApprovalProcessIndex :approveType="2" />
</div>
@@ -15,7 +15,7 @@
</script>
<style scoped>
-.app-container {
+.container {
width: 100%;
height: 100%;
}
diff --git a/src/views/collaborativeApproval/approvalProcess/index3.vue b/src/views/collaborativeApproval/approvalProcess/index3.vue
index 2ce7eca..3afb6f5 100644
--- a/src/views/collaborativeApproval/approvalProcess/index3.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index3.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div class="container">
<!-- 寮曞叆index.vue缁勪欢骞朵紶閫掑弬鏁� -->
<ApprovalProcessIndex :approveType="3" />
</div>
@@ -15,7 +15,7 @@
</script>
<style scoped>
-.app-container {
+.container {
width: 100%;
height: 100%;
}
diff --git a/src/views/collaborativeApproval/approvalProcess/index4.vue b/src/views/collaborativeApproval/approvalProcess/index4.vue
index c088c82..77236af 100644
--- a/src/views/collaborativeApproval/approvalProcess/index4.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index4.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div class="container">
<!-- 寮曞叆index.vue缁勪欢骞朵紶閫掑弬鏁� -->
<ApprovalProcessIndex :approveType="4" />
</div>
@@ -15,7 +15,7 @@
</script>
<style scoped>
-.app-container {
+.container {
width: 100%;
height: 100%;
}
diff --git a/src/views/equipmentManagement/ledger/index.vue b/src/views/equipmentManagement/ledger/index.vue
index 16fbbc6..428a6d9 100644
--- a/src/views/equipmentManagement/ledger/index.vue
+++ b/src/views/equipmentManagement/ledger/index.vue
@@ -127,7 +127,12 @@
} = usePaginationApi(
getLedgerPage,
{
- searchText: undefined,
+ deviceName: undefined,
+ deviceModel: undefined,
+ supplierName: undefined,
+ unit: undefined,
+ entryDateStart: undefined,
+ entryDateEnd: undefined,
},
[
{
diff --git a/src/views/equipmentManagement/repair/index.vue b/src/views/equipmentManagement/repair/index.vue
index 6cae307..fb6c8b0 100644
--- a/src/views/equipmentManagement/repair/index.vue
+++ b/src/views/equipmentManagement/repair/index.vue
@@ -163,7 +163,12 @@
} = usePaginationApi(
getRepairPage,
{
- searchText: undefined,
+ deviceName: undefined,
+ deviceModel: undefined,
+ remark: undefined,
+ maintenanceName: undefined,
+ repairTimeStr: undefined,
+ maintenanceTimeStr: undefined,
},
[
{
diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index f44d817..72da8bc 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -154,7 +154,12 @@
getTableData,
resetFilters,
onCurrentChange,
-} = usePaginationApi(getUpkeepPage, {}, [
+} = usePaginationApi(getUpkeepPage, {
+ deviceName: undefined,
+ maintenancePlanTime: undefined,
+ maintenanceActuallyTime: undefined,
+ maintenanceActuallyName: undefined,
+}, [
{
label: "璁惧鍚嶇О",
align: "center",
diff --git a/src/views/financialManagement/expenseManagement/index.vue b/src/views/financialManagement/expenseManagement/index.vue
index 32d906b..b1e9fb1 100644
--- a/src/views/financialManagement/expenseManagement/index.vue
+++ b/src/views/financialManagement/expenseManagement/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-form :model="filters" :inline="true">
- <el-form-item label="褰曞叆鏃ユ湡:">
+ <el-form-item label="鏀嚭鏃ユ湡:">
<el-date-picker v-model="filters.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
</el-form-item>
diff --git a/src/views/financialManagement/revenueManagement/index.vue b/src/views/financialManagement/revenueManagement/index.vue
index 35f3075..285b73f 100644
--- a/src/views/financialManagement/revenueManagement/index.vue
+++ b/src/views/financialManagement/revenueManagement/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-form :model="filters" :inline="true">
- <el-form-item label="褰曞叆鏃ユ湡:">
+ <el-form-item label="鏀跺叆鏃ユ湡:">
<el-date-picker v-model="filters.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
</el-form-item>
--
Gitblit v1.9.3