From 4d9007c87eab3c7e2275c0d1b98118cecff87298 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 15 Jul 2024 20:44:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=B9=B4?=
 =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E5=88=92=E7=BB=86=E8=8A=82,=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/FileComponent.vue         |  5 ++++
 src/views/plan/detail.vue                     | 30 ++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue
index 330bb56..3c38026 100644
--- a/src/components/DetailComponent/FileComponent.vue
+++ b/src/components/DetailComponent/FileComponent.vue
@@ -162,3 +162,8 @@ watch(() => props.processViewer, (newVal) => {
 }, {deep: true})
 </script>
 
+<style scoped lang="scss">
+:deep(.el-table--fit ) {
+  height: 162px !important;
+}
+</style>
diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue
index 7596225..6557742 100644
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -21,9 +21,20 @@
     </el-form>
     <div class="query-btn">
       <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
-      <el-button color="#DED0B2" v-perm="['annual:plan:edit']" style="float: right;margin: 0 10px 10px 0"
-                 @click="editBtn">编辑
-      </el-button>
+      <el-popover :visible="editVisible" placement="top" :width="160">
+        <p>点击编辑可以修改年度计划名称！</p>
+        <div style="text-align: right; margin: 0">
+          <el-button size="small" color="#DED0B2" @click="editVisible = false">
+            确认
+          </el-button>
+        </div>
+        <template #reference>
+          <el-button color="#DED0B2" v-perm="['annual:plan:edit']" style="float: right;margin: 0 10px 10px 0"
+                     @click="editBtn">编辑
+          </el-button>
+        </template>
+      </el-popover>
+
     </div>
     <el-table ref="table" :data="formData.projectList" border :header-cell-style="{background:'#f5f7fa'}">
       <el-table-column label="四川省国有资产经营投资管理有限责任公司科技创新项目年度计划表" align="center">
@@ -148,6 +159,8 @@ const formData = ref({})
 const table = ref()
 const route = useRoute()
 const isEdit = ref(false)
+const editVisible = ref(true)
+
 const exportTable = () => {
   const $e = table.value.$el
   let $table = $e.querySelector('.el-table__fixed')
@@ -202,14 +215,15 @@ const filterDict = (data, value) => {
 const getDetailInfo = () => {
   loading.value = true
   getPlan(route.query.annualPlanId).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
     if (res.code === 1000) {
       formData.value = res.data
       loading.value = false
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type:'error'
+      })
     }
   })
 }

From 1f631ea65dfa28e49684049c06e2121aca70eef1 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 15 Jul 2024 20:45:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E6=B3=A8=E9=87=8Alog=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fvcomponents/fvTable/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fvcomponents/fvTable/index.vue b/src/fvcomponents/fvTable/index.vue
index 5536b9e..9cbaebe 100644
--- a/src/fvcomponents/fvTable/index.vue
+++ b/src/fvcomponents/fvTable/index.vue
@@ -217,7 +217,6 @@ filterColumns()
 const getList = async () => {
   const {api, params} = props.tableConfig
   const queryParmas = {...localData.query, ...params}
-  console.log("🚀 ~ getList ~ queryParmas:", queryParmas)
   if (api) {
     localData.loading = true
     try {