From e8e987452f216602bfa92cf2b8b91bec06112ed0 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 06 三月 2025 11:02:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/ReportWork/reportWork.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index c4229d1..1c043a5 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -14,8 +14,9 @@
<el-select v-model="report.status" :placeholder="$t('reportmanage.cstate')" style="margin-left: 10px;">
<!-- <el-option :label="$t('reportmanage.all')" value="0"></el-option> -->
<el-option :label="$t('reportmanage.dreportwork')" value="1"></el-option>
- <!-- <el-option :label="$t('reportmanage.pendingwork')" value="2"></el-option> -->
+ <el-option :label="$t('reportmanage.pendingwork')" value="7"></el-option>
<el-option :label="$t('reportmanage.reportwork')" value="3"></el-option>
+ <el-option :label="$t('reportmanage.reportworked')" value="8"></el-option>
</el-select>
<el-select v-model="report.workingProcedure" :placeholder="$t('reportmanage.cprocess')"
style="margin-left: 10px;">
@@ -175,7 +176,7 @@
}else{
selectedType.value = true;
}
- if (report.value.status == 1&&(report.value.type == 8||report.value.type == 1)) {
+ if ((report.value.status == 1||report.value.status == 7)&&(report.value.type == 8||report.value.type == 1)) {
selectedStatus.value = true;
}else{
selectedStatus.value = false;
@@ -216,7 +217,7 @@
ElMessage.error(response.message);
}
}
-
+ selectReportData();
};
const fetchTableData = async () => {
try {
--
Gitblit v1.8.0