Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/project-demand/requirement/detail.vue

src/views/special-fund/add.vue

@@ -6,7 +6,7 @@
         <el-input v-model="formData.name" placeholder="请输入专项资金名称" clearable></el-input>
       </el-form-item>
       <el-form-item label="金额(元)" prop="fundAmount">
-        <el-input v-model="formData.fundAmount" placeholder="请输入金额" clearable></el-input>
+        <el-input-number v-model="formData.fundAmount"  placeholder="请输入金额" :controls="false"/>
       </el-form-item>
     </el-form>
     <baseTitle title="介绍"></baseTitle>
@@ -14,7 +14,7 @@
              v-model:value="formData.introduce"/>
     <baseTitle title="申请文件"></baseTitle>
     <file-upload @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 650px;" v-if="showTable"
+    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable"
              :tableConfig="tableConfig" :data="formData.files"
              :isSettingCol="false" :pagination="false">
       <template #empty>
@@ -170,7 +170,7 @@ const handleSubmit = async (instance) => {
 const handleResubmit = () => {
   if (!route.query.id) return
   let params = {
-    id: route.query.id,
+    specialFundId: route.query.id,
     ...submitParam(formData.value)
   }
   resubmitFund(params).then(res => {
@@ -190,11 +190,6 @@ const handleResubmit = () => {
 const init = async () => {
   processDiagramViewer.value = false
   getFundProcess().then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
     if (res.code === 1000) {
       let data = res.data
       processInstanceData.value = data
@@ -207,6 +202,12 @@ const init = async () => {
       nextTick(() => {
         processDiagramViewer.value = true
       })
+    }else {
+      ElNotification({
+        title: '提示',
+        message: msg,
+        type:'error'
+      })
     }
   })
 }
@@ -238,6 +239,8 @@ onMounted(async () => {
 })
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>

src/views/special-fund/index.vue

@@ -10,6 +10,8 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import { ElNotification} from "element-plus";
+import {deleteFund} from "@/api/special-fund";
 
 const router = useRouter()
 const searchConfig = reactive([
@@ -117,9 +119,6 @@ const tableConfig = reactive({
         if (buttons.has("edit")) {
         btn.push({label: '编辑', prem: ['mosr:collect:resubmit'], func: () => handleEdit(row), type: 'primary'})
         }
-        // if (buttons.has("delete")) {
-        //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
-        // }
         return (
             <div style={{width: '100%'}}>
               {
@@ -162,7 +161,7 @@ const handleDetail = (row) => {
   router.push({
     name: 'Fund/detail',
     query: {
-      id: row.id
+      id: row.specialFundId
     }
   })
 }
@@ -176,7 +175,19 @@ const handleEdit = (row) => {
   router.push({
     name: 'Fund/edit',
     query: {
-      id: row.id
+      id: row.specialFundId
+    }
+  })
+}
+const handleDelete = async (row) => {
+  deleteFund(row.specialFundId).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      tableIns.value.refresh()
     }
   })
 }