fix : 修复页面细节

src/views/special-fund/add.vue

@@ -5,16 +5,16 @@
       <el-form-item label="专项资金名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入专项资金名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="金额" prop="fundAmount">
+      <el-form-item label="金额(万元)" prop="fundAmount">
         <el-input v-model="formData.fundAmount" placeholder="请输入金额" clearable></el-input>
       </el-form-item>
     </el-form>
     <baseTitle title="介绍"></baseTitle>
     <Tinymce image-url="/notice/file" file-url="/notice/file" v-if="showTinymce"
-             v-model:value="formData.introduce" height="300"/>
+             v-model:value="formData.introduce"/>
     <baseTitle title="申请文件"></baseTitle>
     <file-upload @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 200px" v-if="showTable"
+    <fvTable style="width: 100%;max-height: 650px;" v-if="showTable"
              :tableConfig="tableConfig" :data="formData.files"
              :isSettingCol="false" :pagination="false">
       <template #empty>
@@ -34,11 +34,11 @@
 </template>
 
 <script setup lang="jsx">
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElNotification} from "element-plus";
-import {addFund, resubmitFund, getFundDetail} from "@/api/special-fund";
+import {addFund, resubmitFund, getFundDetail,getFundProcess} from "@/api/special-fund";
 import {useRouter} from "vue-router";
 import {useTagsView} from '@/stores/tagsview.js'
-
 import {useProcessStore} from '@/stores/processStore.js';
 
 const tagsViewStore = useTagsView()
@@ -145,7 +145,7 @@ const submitParam = (item) => {
     introduce: item.introduce,
     name: item.name,
     files: files,
-    // deploymentId: processInstanceData.value.deploymentId
+    deploymentId: processInstanceData.value.deploymentId
   }
 }
 const handleSubmit = async (instance) => {
@@ -187,7 +187,8 @@ const handleResubmit = () => {
   })
 }
 const init = async () => {
-  getWorkflowInfo().then(res => {
+  processDiagramViewer.value = false
+  getFundProcess().then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -216,7 +217,7 @@ const getDetailInfo = async () => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      formData.value = res.data.formData
+      formData.value = res.data
       showTinymce.value = false
       showTable.value = false
       nextTick(() => {
@@ -228,7 +229,7 @@ const getDetailInfo = async () => {
 }
 onMounted(async () => {
   loading.value = true
-  // await init()
+  await init()
   if (route.query.id) {
     await getDetailInfo()
   }

src/views/special-fund/detail.vue

@@ -5,8 +5,8 @@
 
 <script setup lang="jsx">
 import {ElNotification} from "element-plus";
-import {getFundDetail} from "@/api/special-fund";
 import {useProcessStore} from '@/stores/processStore.js';
+import {getFundDetailProcess} from "@api/special-fund";
 const processStore = useProcessStore()
 const route = useRoute()
 const fundData = ref({})
@@ -17,7 +17,8 @@ const getDetail = async () => {
   const specialFundId = route.query.id
   showTable.value = false
   loading.value = true
-  const {code, data, msg} = await getFundDetail(specialFundId)
+  fundProcessViewer.value = false
+  const {code, data, msg} = await getFundDetailProcess(specialFundId)
   ElNotification({
     title: '提示',
     message: msg,
@@ -26,17 +27,17 @@ const getDetail = async () => {
   if (code === 1000) {
     fundData.value = data
     loading.value = false
+    if(data.operationList==null)return;
+    processStore.setDesign(data)
+    processStore.runningList.value = data.runningList;
+    processStore.endList.value = data.endList;
+    processStore.noTakeList.value = data.noTakeList;
+    processStore.refuseList.value = data.refuseList;
+    processStore.passList.value = data.passList;
     nextTick(() => {
+      fundProcessViewer.value = true
       showTable.value = true
     })
-    // if(data.operationList==null)return;
-    // processStore.setDesign(data)
-    // processStore.runningList.value = data.runningList;
-    // processStore.endList.value = data.endList;
-    // processStore.noTakeList.value = data.noTakeList;
-    // processStore.refuseList.value = data.refuseList;
-    // processStore.passList.value = data.passList;
-
   }else {
     loading.value = false
   }

src/views/special-fund/index.vue

@@ -33,7 +33,7 @@ const searchConfig = reactive([
     }
   },
   {
-    label: '资金金额',
+    label: '资金金额(万元)',
     prop: 'fundAmount',
     component: 'el-input',
     props: {
@@ -41,7 +41,7 @@ const searchConfig = reactive([
       placeholder: '请输入资金金额查询'
     }
   }, {
-    label: '剩余金额',
+    label: '剩余金额(万元)',
     prop: 'residualAmount',
     component: 'el-input',
     props: {
@@ -65,14 +65,19 @@ const tableConfig = reactive({
       label: '专项资金名称',
       align: 'center'
     },
+    {
+      prop: 'approveName',
+      label: '审批人',
+      align: 'center'
+    },
     {
       prop: 'fundAmount',
-      label: '资金金额',
+      label: '资金金额(万元)',
       align: 'center'
     },
     {
       prop: 'residualAmount',
-      label: '剩余金额',
+      label: '剩余金额(万元)',
       align: 'center'
     },
     {
@@ -80,13 +85,18 @@ const tableConfig = reactive({
       label: '项目数量',
       align: 'center'
     },
+    {
+      prop: 'taskNode',
+      label: '当前节点',
+      align: 'center'
+    },
     {
       prop: 'state',
       label: '状态',
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if (row.state == undefined) {
+        if (row.state == undefined||row.state == 0) {
           return '--'
         } else {
           return (<Tag dictType={'special_fund'} value={row.state}/>)
@@ -100,13 +110,13 @@ const tableConfig = reactive({
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []
-        // let buttons = new Set(Array.from(row.buttons))
-        // if (buttons.has("details")) {
+        let buttons = new Set(Array.from(row.buttons))
+        if (buttons.has("details")) {
         btn.push({label: '详情', prem: ['mosr:collect:info'], func: () => handleDetail(row), type: 'primary'})
-        // }
-        // if (buttons.has("edit")) {
+        }
+        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'})
         // }
@@ -124,6 +134,13 @@ const tableConfig = reactive({
                     </el-button>
                 ))
               }
+              {
+                buttons.has("delete") ?
+                <popover-delete name={row.name} type={'专项资金'} btnType={'danger'}
+                                perm={['mosr:requirement:del']}
+                                onDelete={() => handleDelete(row)}/>
+                : ''
+              }
             </div>
         )
       }