Merge pull request 'master' (#563) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/563

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>

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 {

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"
+      <el-popover :visible="editVisible" placement="top" :width="160">
-                 @click="editBtn">编辑
+        <p>点击编辑可以修改年度计划名称！</p>
-      </el-button>
+        <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'
+      })
     }
   })
 }