From 3c456949b70671cc2ad95ad5395dfaceda519f17 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 10:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 company/src/components/enterprise/selectSolutions.vue |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/company/src/components/enterprise/selectSolutions.vue b/company/src/components/enterprise/selectSolutions.vue
index 49d664e..c165df1 100644
--- a/company/src/components/enterprise/selectSolutions.vue
+++ b/company/src/components/enterprise/selectSolutions.vue
@@ -41,14 +41,14 @@
                 prop="worktypeName"
                 label="鎵�灞炲伐绉�">
             </el-table-column>
-            <el-table-column
-                prop="startTime"
-                label="淇濋櫓鐢熸晥璧锋湡">
-            </el-table-column>
-            <el-table-column
-                prop="endTime"
-                label="淇濋櫓鐢熸晥姝㈡湡">
-            </el-table-column>
+<!--            <el-table-column-->
+<!--                prop="startTime"-->
+<!--                label="淇濋櫓鐢熸晥璧锋湡">-->
+<!--            </el-table-column>-->
+<!--            <el-table-column-->
+<!--                prop="endTime"-->
+<!--                label="淇濋櫓鐢熸晥姝㈡湡">-->
+<!--            </el-table-column>-->
         </el-table>
     </GlobalWindow>
 </template>
@@ -97,7 +97,8 @@
             },
             getList() {
                 findList({
-                    memberId: this.id
+                    memberId: this.id,
+                    status: 1
                 }).then(res => {
                     this.list = res
                 })

--
Gitblit v1.9.3