Merge pull request 'fix : 修复台账基础信息展示及年度计划通过后跳转' (#503) from dd into master

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

src/components/DetailComponent/SummaryDetail.vue

@@ -272,6 +272,9 @@ const handleRejectPlan = async () => {
     type: res.code === 1000 ? 'success' : 'error'
   })
   tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  router.push({
+    name: 'Summary'
+  })
 }
 const handleAgreePlan = async () => {
   const params = {
@@ -287,6 +290,9 @@ const handleAgreePlan = async () => {
     type: res.code === 1000 ? 'success' : 'error'
   })
   tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  router.push({
+    name: 'Summary'
+  })
 }
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;

src/router/index.js

@@ -179,7 +179,7 @@ const router = createRouter({
                 {
                     path: '/special/fund/fund/detail',
                     name: 'Fund/detail',
-                    component: () => import('@/views/project-demand/requirement/detail.vue'),
+                    component: () => import('@/views/special-fund/detail.vue'),
                     meta: {
                         title: '专项资金-详情',
                         breadcrumb: false
@@ -189,7 +189,7 @@ const router = createRouter({
                 {
                     path: '/expense/management/expense/share/share/detail',
                     name: 'Share/detail',
-                    component: () => import('@/views/project-demand/requirement/detail.vue'),
+                    component: () => import('@/views/expense-management/share/detail.vue'),
                     meta: {
                         title: '费用分摊-详情',
                         breadcrumb: false

src/views/project-management/implementation/account.vue

@@ -1,6 +1,20 @@
 <template>
   <view style="overflow-y: scroll">
     <baseTitle title="基础信息"></baseTitle>
+    <el-form :model="basicData">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item prop="requirementName" label="征集名称" label-width="122">
+            <span>{{basicData.requirementName}}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="projectName" label="项目名称" label-width="130">
+            <span>{{basicData.projectName}}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
     <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
     <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
     <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick" @selectionChange="selectionChange">
@@ -20,37 +34,9 @@ import {searchUpdateLedgerData,exportExcel} from "@/api/project-manage";
 
 const router = useRouter()
 const route = useRoute()
-const formArray = ref([
-  {
-    label: '征集名称',
-    prop: 'requirementName',
-    colProps: {
-      span: 12
-    }
-  },
-  {
-    label: '项目名称',
-    prop: 'projectName',
-    colProps: {
-      span: 12
-    }
-  }
-])
+const basicData=ref({})
+const tableData = ref({})
 const formDataArray = ref([
-  {
-    label: '征集名称',
-    prop: 'requirementName',
-    colProps: {
-      span: 8
-    }
-  },
-  {
-    label: '项目名称',
-    prop: 'projectName',
-    colProps: {
-      span: 8
-    }
-  },
   {
     label: '项目负责人',
     prop: 'projectChargePersonName',
@@ -102,13 +88,8 @@ const formDataArray = ref([
     }
   }
 ])
-const tableData = ref({})
 const schema = computed(() => {
-  // if (JSON.stringify(tableData.value) !== '{}') {
     return formDataArray.value
-  // } else {
-  //   return formArray.value
-  // }
 })
 const baseForm = ref()
 const tableIns = ref()
@@ -259,8 +240,7 @@ const handleUpdateTable = () => {
 const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
-    baseForm.value.setValues(data)
-    await init()
+    basicData.value=data
   } catch {
   }
 }
@@ -279,6 +259,7 @@ const init = async () => {
   // }
 }
 getBaseInfo()
+init()
 const headBtnClick = (key) => {
   switch (key) {
     case 'add':