fix : 修复需求征集界面样式及提示

src/fvcomponents/fvTable/index.vue

@@ -19,7 +19,9 @@
     <div v-if="isSettingCol" style="float: right">
       <el-tooltip effect="dark" content="列配置" placement="bottom">
         <el-button ref="buttonRef" link>
-          <el-icon size="18"><Setting /></el-icon>
+          <el-icon size="18">
+            <Setting/>
+          </el-icon>
         </el-button>
       </el-tooltip>
       <el-popover
@@ -30,7 +32,8 @@
           virtual-triggering
           trigger="click">
         <div class="col-setting-checkall">
-          <el-checkbox label="列展示" v-model="localData.allColShow" :indeterminate="localData.indeterminate" @change="changeIsShowAll"></el-checkbox>
+          <el-checkbox label="列展示" v-model="localData.allColShow" :indeterminate="localData.indeterminate"
+                       @change="changeIsShowAll"></el-checkbox>
         </div>
         <div class="col-setting-list">
           <el-checkbox-group v-model="localData.checkGroup" @change="changeColShow">
@@ -96,7 +99,7 @@
 </template>
 
 <script setup>
-import { ElMessage } from 'element-plus';
+import {ElNotification} from 'element-plus';
 import {requestList} from '../../api/common';
 
 const props = defineProps({
@@ -200,16 +203,25 @@ const getList = async () => {
     localData.loading = true
     try {
       const {code, data, msg} = await requestList(api, queryParmas)
+
       if (code === 1000) {
         localData.list = data.rows
         localData.total = data.total
         localData.loading = false
       } else {
-        ElMessage.error(msg)
+        ElNotification({
+          title: '提示',
+          message: msg,
+          type: 'error'
+        })
         localData.loading = false
       }
     } catch (error) {
-      ElMessage.error('请求数据失败')
+      ElNotification({
+        title: '提示',
+        message: '请求数据失败',
+        type: 'error'
+      })
       localData.loading = false
     }
   } else {
@@ -277,20 +289,24 @@ onMounted(() => {
 .col-setting-checkall {
   border-bottom: 1px solid rgb(210, 210, 213);
 }
+
 .col-setting-list {
   max-height: 45vh;
   overflow-y: auto;
 }
+
 .table-head-btn {
   display: flex;
   justify-content: flex-start;
   align-items: center;
 }
+
 .fv-table-btn {
   display: flex;
   justify-content: space-between;
   align-content: center;
 }
+
 .fv-table {
   :deep(.el-tooltip) {
     width: 100% !important;

src/views/project-demand/requirement/add.vue

@@ -57,7 +57,7 @@
               v-model:value="formData.collectExplain"  />
     <baseTitle title="申请文件"></baseTitle>
     <file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 650px;" v-if="showTable"
+    <fvTable style="width: 100%;max-height: 600px;height: 600px" v-if="showTable"
              :tableConfig="tableConfig" :data="formData.fileList"
              :isSettingCol="false" :pagination="false">
       <template #empty>

src/views/project-demand/requirement/detail.vue

@@ -40,7 +40,7 @@
         <baseTitle title="附件列表"></baseTitle>
         <el-col :span="24" v-if="checkFormPrem('collectExplain')">
           <el-form-item>
-            <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig"
+            <fvTable style="width: 100%;max-height: 600px;height: 600px" v-if="showTable" :tableConfig="tableConfig"
                      :data="formData.fileList" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -86,7 +86,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo, agreeTask, rejectTask, downloadFile} from "@/api/project-demand/index.js";
 import {getSubCompOpt} from '@/api/user/user.js'
-import {ElMessage} from "element-plus";
+import {ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
 import {matterTree} from '@/utils/matterTree.js';
 import {getFundOption} from "@/api/special-fund";
@@ -170,14 +170,16 @@ const handleSubmit = () => {
     formData: formData.value
   }
   agreeTask(approve).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
     if (res.code === 1000) {
-      ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
         name: 'Requirement'
       })
-    } else {
-      ElMessage.error(res.msg)
     }
   })
 }
@@ -190,14 +192,16 @@ const handleReject = (instance) => {
       auditOpinion: formData.value.auditOpinion,
     }
     rejectTask(approve).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
       if (res.code === 1000) {
-        ElMessage.success(res.msg)
         tagsViewStore.delVisitedViews(router.currentRoute.value.path)
         router.push({
           name: 'Requirement'
         })
-      } else {
-        ElMessage.error(res.msg)
       }
     })
   })

src/views/project-demand/requirement/index.vue

@@ -11,7 +11,7 @@
 import {useAuthStore} from '@/stores/userstore.js'
 import Tag from '@/components/Tag.vue'
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import {ElMessage, ElNotification} from "element-plus";
+import { ElNotification} from "element-plus";
 import {deleteDemand} from "@/api/project-demand";
 
 const authStore = useAuthStore()
@@ -115,9 +115,9 @@ const tableConfig = reactive({
         // if (buttons.has("delete")) {
         //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
         // }
-        if (buttons.has("report")) {
+        // if (buttons.has("report")) {
           btn.push({label: '需求上报', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
-        }
+        // }
         return (
             <div style={{width: '100%'}}>
               {
@@ -173,12 +173,12 @@ const handleEdit = (row) => {
 }
 const handleDelete = (row) => {
   deleteDemand(row.requirementId).then(res => {
-    if (res.code === 1000) {
+    ElNotification({
-      ElMessage.success(res.msg)
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
     tableIns.value.refresh()
-    } else {
-      ElMessage.error(res.msg)
-    }
   })
 }
 const handleDetail = (row) => {